From 654c36f4efdb1cb3252d5de2eda623dc367bc225 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Apr 2024 14:24:17 +0200 Subject: [PATCH] uic/Python: Recognize more C++ suffixes when determining the custom widget module Also check for .H, .hh, .hpp. Task-number: PYSIDE-2648 Change-Id: I993647e2b55e3b76d714a9d3a4b539c2d5874f04 Reviewed-by: Cristian Maureira-Fredes (cherry picked from commit bd231cc051d6246f572af23d953c27a95e0846a8) Reviewed-by: Qt Cherry-pick Bot --- src/tools/uic/python/pythonwriteimports.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp index b122c0f895b..74eeab8387e 100644 --- a/src/tools/uic/python/pythonwriteimports.cpp +++ b/src/tools/uic/python/pythonwriteimports.cpp @@ -229,9 +229,13 @@ void WriteImports::addPythonCustomWidget(const QString &className, const DomCust QString modulePath = node->elementHeader()->text(); // Replace the '/' by '.' modulePath.replace(u'/', u'.'); - // '.h' is added by default on headers for - if (modulePath.endsWith(".h"_L1)) + // '.h' is added by default on headers for . + if (modulePath.endsWith(".h"_L1, Qt::CaseInsensitive)) modulePath.chop(2); + else if (modulePath.endsWith(".hh"_L1)) + modulePath.chop(3); + else if (modulePath.endsWith(".hpp"_L1)) + modulePath.chop(4); insertClass(modulePath, className, &m_customWidgets); } }