From 832a337831a4736a3a610764271b1ab4cf0699bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= <timothee.keller@qt.io>
Date: Wed, 23 Nov 2022 11:04:41 +0100
Subject: [PATCH] Windeployqt: change platform plugin base filter

Add infix to "qwindows" for platform plugin search if it exists, to
account for libinfix builds

Task-number: QTBUG-105820
Pick-to: 6.4
Change-Id: I7a3c671fb6cdb4a216f6f4bffb445add4f8e0c83
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/tools/windeployqt/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index aa3655e388..b385d4f2da 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -1024,6 +1024,8 @@ QStringList findQtPlugins(ModuleBitset *usedQtModules, const ModuleBitset &disab
                 case WindowsDesktopMsvc:
                 case WindowsDesktopMinGW:
                     filter = QStringLiteral("qwindows");
+                    if (!infix.isEmpty())
+                        filter += infix;
                     break;
                 case Unix:
                     filter = QStringLiteral("libqxcb");