Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Change-Id: I4d3041fa291a918c774ffa5eb5c8792a0966451d

14 files changed, 90 insertions, 115 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 03ea937ab3..6503acaef0 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -3293,12 +3293,8 @@ QPalette QGuiApplication::palette()
 */
 void QGuiApplication::setPalette(const QPalette &pal)
 {
-    if (QGuiApplicationPrivate::app_pal && pal.isCopyOf(*QGuiApplicationPrivate::app_pal))
+    if (!QGuiApplicationPrivate::setPalette(pal))
         return;
-    if (!QGuiApplicationPrivate::app_pal)
-        QGuiApplicationPrivate::app_pal = new QPalette(pal);
-    else
-        *QGuiApplicationPrivate::app_pal = pal;
 
     QCoreApplication::setAttribute(Qt::AA_SetPalette);
 
@@ -3306,6 +3302,19 @@ void QGuiApplication::setPalette(const QPalette &pal)
         qGuiApp->d_func()->sendApplicationPaletteChange();
 }
 
+bool QGuiApplicationPrivate::setPalette(const QPalette &palette)
+{
+    if (app_pal && palette.isCopyOf(*app_pal))
+        return false;
+
+    if (!app_pal)
+        app_pal = new QPalette(palette);
+    else
+        *app_pal = palette;
+
+    return true;
+}
+
 void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
 {
     windowGeometrySpecification.applyTo(window);
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 9f3fa7212a..a8017216d4 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -326,6 +326,8 @@ public:
 
     static void resetCachedDevicePixelRatio();
 
+    static bool setPalette(const QPalette &palette);
+
 protected:
     virtual void notifyThemeChanged();
     virtual void sendApplicationPaletteChange(bool toAllWidgets = false, const char *className = nullptr);
diff --git a/src/gui/kernel/qinputdevicemanager_p_p.h b/src/gui/kernel/qinputdevicemanager_p_p.h
index 871f9315c3..82a86446a0 100644
--- a/src/gui/kernel/qinputdevicemanager_p_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p_p.h
@@ -69,7 +69,7 @@ public:
     int deviceCount(QInputDeviceManager::DeviceType type) const;
     void setDeviceCount(QInputDeviceManager::DeviceType type, int count);
 
-    std::array<int, QInputDeviceManager::NumDeviceTypes> m_deviceCount;
+    std::array<int, QInputDeviceManager::NumDeviceTypes> m_deviceCount = {};
 
     Qt::KeyboardModifiers keyboardModifiers;
 };
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index a82edbb073..b53c9a3eab 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1330,6 +1330,7 @@ void QOpenGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stop
 QOpenGL2PaintEngineEx::QOpenGL2PaintEngineEx()
     : QPaintEngineEx(*(new QOpenGL2PaintEngineExPrivate(this)))
 {
+    gccaps &= ~QPaintEngine::RasterOpModes;
 }
 
 QOpenGL2PaintEngineEx::~QOpenGL2PaintEngineEx()
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index f40ca9d8b4..91214f27ca 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -341,9 +341,10 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP
     } else if (m_format == QFontEngine::Format_Mono) {
         if (mask.depth() > 1) {
             // TODO optimize this
-            mask = mask.alphaChannel();
+            mask.convertTo(QImage::Format_Alpha8);
+            mask.reinterpretAsFormat(QImage::Format_Grayscale8);
             mask.invertPixels();
-            mask = mask.convertToFormat(QImage::Format_Mono, Qt::ThresholdDither);
+            mask.convertTo(QImage::Format_Mono, Qt::ThresholdDither);
         }
 
         int mw = qMin(mask.width(), c.w);
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index 00d4df53bd..d2c8ae104e 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -3939,6 +3939,12 @@ void QRhiImplementation::textureFormatInfo(QRhiTexture::Format format, const QSi
     case QRhiTexture::RGBA32F:
         bpc = 16;
         break;
+    case QRhiTexture::R16F:
+        bpc = 2;
+        break;
+    case QRhiTexture::R32F:
+        bpc = 4;
+        break;
 
     case QRhiTexture::D16:
         bpc = 2;
diff --git a/src/gui/rhi/qrhi_p.h b/src/gui/rhi/qrhi_p.h
index a6c65aac5e..3a64835c22 100644
--- a/src/gui/rhi/qrhi_p.h
+++ b/src/gui/rhi/qrhi_p.h
@@ -728,6 +728,8 @@ public:
 
         RGBA16F,
         RGBA32F,
+        R16F,
+        R32F,
 
         D16,
         D32F,
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
index c5923fe411..445d162595 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -630,9 +630,7 @@ void QRhiD3D11::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.simage.tex);
@@ -644,9 +642,7 @@ void QRhiD3D11::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.sbuf.buf);
@@ -1106,6 +1102,10 @@ static inline DXGI_FORMAT toD3DTextureFormat(QRhiTexture::Format format, QRhiTex
         return DXGI_FORMAT_R16G16B16A16_FLOAT;
     case QRhiTexture::RGBA32F:
         return DXGI_FORMAT_R32G32B32A32_FLOAT;
+    case QRhiTexture::R16F:
+        return DXGI_FORMAT_R16_FLOAT;
+    case QRhiTexture::R32F:
+        return DXGI_FORMAT_R32_FLOAT;
 
     case QRhiTexture::D16:
         return DXGI_FORMAT_R16_TYPELESS;
@@ -1128,39 +1128,24 @@ static inline DXGI_FORMAT toD3DTextureFormat(QRhiTexture::Format format, QRhiTex
         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;
@@ -1201,7 +1186,6 @@ static inline bool isDepthTextureFormat(QRhiTexture::Format format)
 {
     switch (format) {
     case QRhiTexture::Format::D16:
-        Q_FALLTHROUGH();
     case QRhiTexture::Format::D32F:
         return true;
 
@@ -1867,9 +1851,7 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD)
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QD3D11Texture *texD = QRHI_RES(QD3D11Texture, b->u.simage.tex);
@@ -1885,9 +1867,7 @@ void QRhiD3D11::updateShaderResourceBindings(QD3D11ShaderResourceBindings *srbD)
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QD3D11Buffer *bufD = QRHI_RES(QD3D11Buffer, b->u.sbuf.buf);
@@ -3356,11 +3336,9 @@ static inline D3D11_BLEND toD3DBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
     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:
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index e63ed11dd4..afa3a397e6 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -165,6 +165,14 @@ QT_BEGIN_NAMESPACE
 #define GL_RGBA16F                        0x881A
 #endif
 
+#ifndef GL_R16F
+#define GL_R16F                           0x822D
+#endif
+
+#ifndef GL_R32F
+#define GL_R32F                           0x822E
+#endif
+
 #ifndef GL_HALF_FLOAT
 #define GL_HALF_FLOAT                     0x140B
 #endif
@@ -681,7 +689,6 @@ bool QRhiGles2::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture
 
     switch (format) {
     case QRhiTexture::D16:
-        Q_FALLTHROUGH();
     case QRhiTexture::D32F:
         return caps.depthTexture;
 
@@ -695,10 +702,13 @@ bool QRhiGles2::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture
         return caps.r16Format;
 
     case QRhiTexture::RGBA16F:
-        Q_FALLTHROUGH();
     case QRhiTexture::RGBA32F:
         return caps.floatFormats;
 
+    case QRhiTexture::R16F:
+    case QRhiTexture::R32F:
+        return caps.floatFormats;
+
     default:
         break;
     }
@@ -899,9 +909,7 @@ void QRhiGles2::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
                                    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);
@@ -917,9 +925,7 @@ void QRhiGles2::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.sbuf.buf);
@@ -1654,11 +1660,8 @@ static inline GLenum toGlBlendFactor(QRhiGraphicsPipeline::BlendFactor f)
     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;
@@ -2573,9 +2576,7 @@ void QRhiGles2::bindShaderResources(QRhiGraphicsPipeline *maybeGraphicsPs, QRhiC
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QGles2Texture *texD = QRHI_RES(QGles2Texture, b->u.simage.tex);
@@ -2591,9 +2592,7 @@ void QRhiGles2::bindShaderResources(QRhiGraphicsPipeline *maybeGraphicsPs, QRhiC
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QGles2Buffer *bufD = QRHI_RES(QGles2Buffer, b->u.sbuf.buf);
@@ -3397,6 +3396,18 @@ bool QGles2Texture::prepareBuild(QSize *adjustedSize)
             glformat = GL_RGBA;
             gltype = GL_FLOAT;
             break;
+        case QRhiTexture::R16F:
+            glintformat = GL_R16F;
+            glsizedintformat = glintformat;
+            glformat = GL_RED;
+            gltype = GL_HALF_FLOAT;
+            break;
+        case QRhiTexture::R32F:
+            glintformat = GL_R32F;
+            glsizedintformat = glintformat;
+            glformat = GL_RED;
+            gltype = GL_FLOAT;
+            break;
         case QRhiTexture::D16:
             glintformat = GL_DEPTH_COMPONENT16;
             glsizedintformat = glintformat;
diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index 222bf170dc..883d6923b9 100644
--- a/src/gui/rhi/qrhimetal.mm
+++ b/src/gui/rhi/qrhimetal.mm
@@ -664,15 +664,15 @@ static inline int mapBinding(int binding,
                              BindingType type)
 {
     const QShader::NativeResourceBindingMap *map = nativeResourceBindingMaps[stageIndex];
-    if (!map)
+    if (!map || map->isEmpty())
         return binding; // old QShader versions do not have this map, assume 1:1 mapping then
 
     auto it = map->constFind(binding);
     if (it != map->cend())
         return type == BindingType::Sampler ? it->second : it->first; // may be -1, if the resource is inactive
 
-    // Hitting this path is normal too, is not given that the resource (e.g. a
-    // uniform block) is really present in the shaders for all the stages
+    // Hitting this path is normal too. It is not given that the resource (for
+    // example, a uniform block) is present in the shaders for all the stages
     // specified by the visibility mask in the QRhiShaderResourceBinding.
     return -1;
 }
@@ -761,9 +761,7 @@ void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
@@ -786,9 +784,7 @@ void QRhiMetal::enqueueShaderResourceBindings(QMetalShaderResourceBindings *srbD
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
@@ -996,9 +992,7 @@ void QRhiMetal::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
@@ -1011,9 +1005,7 @@ void QRhiMetal::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBind
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
@@ -2328,6 +2320,10 @@ static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QR
         return MTLPixelFormatRGBA16Float;
     case QRhiTexture::RGBA32F:
         return MTLPixelFormatRGBA32Float;
+    case QRhiTexture::R16F:
+        return MTLPixelFormatR16Float;
+    case QRhiTexture::R32F:
+        return MTLPixelFormatR32Float;
 
     case QRhiTexture::D16:
 #ifdef Q_OS_MACOS
@@ -2928,9 +2924,7 @@ bool QMetalShaderResourceBindings::build()
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QMetalTexture *texD = QRHI_RES(QMetalTexture, b->u.simage.tex);
@@ -2939,9 +2933,7 @@ bool QMetalShaderResourceBindings::build()
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QMetalBuffer *bufD = QRHI_RES(QMetalBuffer, b->u.sbuf.buf);
diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index c5719b54aa..c4f56f2dd2 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -767,6 +767,10 @@ static inline VkFormat toVkTextureFormat(QRhiTexture::Format format, QRhiTexture
         return VK_FORMAT_R16G16B16A16_SFLOAT;
     case QRhiTexture::RGBA32F:
         return VK_FORMAT_R32G32B32A32_SFLOAT;
+    case QRhiTexture::R16F:
+        return VK_FORMAT_R16_SFLOAT;
+    case QRhiTexture::R32F:
+        return VK_FORMAT_R32_SFLOAT;
 
     case QRhiTexture::D16:
         return VK_FORMAT_D16_UNORM;
@@ -864,7 +868,6 @@ static inline bool isDepthTextureFormat(QRhiTexture::Format format)
 {
     switch (format) {
     case QRhiTexture::Format::D16:
-        Q_FALLTHROUGH();
     case QRhiTexture::Format::D32F:
         return true;
 
@@ -2373,9 +2376,7 @@ void QRhiVulkan::updateShaderResourceBindings(QRhiShaderResourceBindings *srb, i
             }
                 break;
             case QRhiShaderResourceBinding::ImageLoad:
-                Q_FALLTHROUGH();
             case QRhiShaderResourceBinding::ImageStore:
-                Q_FALLTHROUGH();
             case QRhiShaderResourceBinding::ImageLoadStore:
             {
                 QVkTexture *texD = QRHI_RES(QVkTexture, b->u.simage.tex);
@@ -2394,9 +2395,7 @@ void QRhiVulkan::updateShaderResourceBindings(QRhiShaderResourceBindings *srb, i
             }
                 break;
             case QRhiShaderResourceBinding::BufferLoad:
-                Q_FALLTHROUGH();
             case QRhiShaderResourceBinding::BufferStore:
-                Q_FALLTHROUGH();
             case QRhiShaderResourceBinding::BufferLoadStore:
             {
                 QVkBuffer *bufD = QRHI_RES(QVkBuffer, b->u.sbuf.buf);
@@ -3564,9 +3563,7 @@ static inline VkImageLayout toVkLayout(QRhiPassResourceTracker::TextureAccess ac
     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:
@@ -4045,9 +4042,7 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin
         }
             break;
         case QRhiShaderResourceBinding::ImageLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::ImageLoadStore:
         {
             QVkTexture *texD = QRHI_RES(QVkTexture, b->u.simage.tex);
@@ -4072,9 +4067,7 @@ void QRhiVulkan::setShaderResources(QRhiCommandBuffer *cb, QRhiShaderResourceBin
         }
             break;
         case QRhiShaderResourceBinding::BufferLoad:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferStore:
-            Q_FALLTHROUGH();
         case QRhiShaderResourceBinding::BufferLoadStore:
         {
             QVkBuffer *bufD = QRHI_RES(QVkBuffer, b->u.sbuf.buf);
@@ -4863,16 +4856,12 @@ static inline VkDescriptorType toVkDescriptorType(const QRhiShaderResourceBindin
         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;
 
@@ -6356,17 +6345,11 @@ 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:
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp
index 0b99281f08..9203d63cd2 100644
--- a/src/gui/rhi/qshader.cpp
+++ b/src/gui/rhi/qshader.cpp
@@ -439,10 +439,19 @@ QShader QShader::fromSerialized(const QByteArray &data)
     d->stage = Stage(intVal);
     QByteArray descBin;
     ds >> descBin;
-    if (d->qsbVersion > QShaderPrivate::QSB_VERSION_WITH_BINARY_JSON)
+    if (d->qsbVersion > QShaderPrivate::QSB_VERSION_WITH_BINARY_JSON) {
         d->desc = QShaderDescription::fromCbor(descBin);
-    else
+    } else {
+#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_DEPRECATED
         d->desc = QShaderDescription::fromBinaryJson(descBin);
+        QT_WARNING_POP
+#else
+        qWarning("Cannot load QShaderDescription from binary JSON due to disabled binaryjson feature");
+        d->desc = QShaderDescription();
+#endif
+    }
     int count;
     ds >> count;
     for (int i = 0; i < count; ++i) {
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp
index 7e9b7d7b8e..76c5d0ebef 100644
--- a/src/gui/rhi/qshaderdescription.cpp
+++ b/src/gui/rhi/qshaderdescription.cpp
@@ -102,8 +102,8 @@ QT_BEGIN_NAMESPACE
     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
+    can also be serialized to JSON and CBOR, and can be deserialized
+    from CBOR. 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:
@@ -336,28 +336,10 @@ bool QShaderDescription::isValid() const
 }
 
 /*!
-    \return a serialized binary version of the data.
-
-    \sa toJson(), toCbor()
- */
-QByteArray QShaderDescription::toBinaryJson() const
-{
-#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    return d->makeDoc().toBinaryData();
-QT_WARNING_POP
-#else
-    qWarning("Cannot generate binary JSON from QShaderDescription due to disabled binaryjson feature");
-    return QByteArray();
-#endif
-}
-
-/*!
    \return a serialized binary version of the data in CBOR (Concise Binary
    Object Representation) format.
 
-   \sa QCborValue, toBinaryJson(), toJson()
+   \sa QCborValue, toJson()
  */
 QByteArray QShaderDescription::toCbor() const
 {
@@ -369,14 +351,17 @@ QByteArray QShaderDescription::toCbor() const
 
     \note There is no deserialization method provided for JSON text.
 
-    \sa toBinaryJson(), toCbor()
+    \sa toCbor()
  */
 QByteArray QShaderDescription::toJson() const
 {
     return d->makeDoc().toJson();
 }
 
+#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
 /*!
+    \deprecated
+
     Deserializes the given binary JSON \a data and returns a new
     QShaderDescription.
 
@@ -385,22 +370,16 @@ QByteArray QShaderDescription::toJson() const
 QShaderDescription QShaderDescription::fromBinaryJson(const QByteArray &data)
 {
     QShaderDescription desc;
-#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_DEPRECATED
     QShaderDescriptionPrivate::get(&desc)->loadDoc(QJsonDocument::fromBinaryData(data));
 QT_WARNING_POP
-#else
-    Q_UNUSED(data);
-    qWarning("Cannot load QShaderDescription from binary JSON due to disabled binaryjson feature");
-#endif
     return desc;
 }
+#endif
 
 /*!
     Deserializes the given CBOR \a data and returns a new QShaderDescription.
-
-    \sa fromBinaryJson()
  */
 QShaderDescription QShaderDescription::fromCbor(const QByteArray &data)
 {
diff --git a/src/gui/rhi/qshaderdescription_p.h b/src/gui/rhi/qshaderdescription_p.h
index e02a53dcb5..872ee8b138 100644
--- a/src/gui/rhi/qshaderdescription_p.h
+++ b/src/gui/rhi/qshaderdescription_p.h
@@ -68,11 +68,13 @@ public:
 
     bool isValid() const;
 
-    QByteArray toBinaryJson() const;
     QByteArray toCbor() const;
     QByteArray toJson() const;
 
+#if QT_CONFIG(binaryjson) && QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use CBOR format instead")
     static QShaderDescription fromBinaryJson(const QByteArray &data);
+#endif
     static QShaderDescription fromCbor(const QByteArray &data);
 
     enum VariableType {