1 files changed, 53 insertions, 21 deletions

diff --git a/src/tools/uic/python/pythonwriteimports.cpp b/src/tools/uic/python/pythonwriteimports.cpp
index a894a00a8d..74eeab8387 100644
--- a/src/tools/uic/python/pythonwriteimports.cpp
+++ b/src/tools/uic/python/pythonwriteimports.cpp
@@ -10,6 +10,8 @@
 
 #include <ui4.h>
 
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
 #include <QtCore/qtextstream.h>
 
 #include <algorithm>
@@ -54,20 +56,6 @@ static WriteImports::ClassesPerModule defaultClasses()
     };
 }
 
-// Change the name of a qrc file "dir/foo.qrc" file to the Python
-// module name "foo_rc" according to project conventions.
-static QString pythonResource(QString resource)
-{
-    const qsizetype lastSlash = resource.lastIndexOf(u'/');
-    if (lastSlash != -1)
-        resource.remove(0, lastSlash + 1);
-    if (resource.endsWith(".qrc"_L1)) {
-        resource.chop(4);
-        resource.append("_rc"_L1);
-    }
-    return resource;
-}
-
 // Helpers for WriteImports::ClassesPerModule maps
 static void insertClass(const QString &module, const QString &className,
                         WriteImports::ClassesPerModule *c)
@@ -140,17 +128,57 @@ void WriteImports::acceptUI(DomUI *node)
         const auto includes = resources->elementInclude();
         for (auto include : includes) {
             if (include->hasAttributeLocation())
-                writeImport(pythonResource(include->attributeLocation()));
+                writeResourceImport(include->attributeLocation());
         }
         output << '\n';
     }
 }
 
-void WriteImports::writeImport(const QString &module)
+QString WriteImports::resourceAbsolutePath(QString resource) const
 {
-    if (uic()->option().fromImports)
-        uic()->output() << "from  . ";
-    uic()->output() << "import " << module << '\n';
+    // If we know the project root, generate an absolute Python import
+    // to the resource. options. pythonRoot is the Python path component
+    // under which the UI file is.
+    const auto &options = uic()->option();
+    if (!options.inputFile.isEmpty() && !options.pythonRoot.isEmpty()) {
+        resource = QDir::cleanPath(QFileInfo(options.inputFile).canonicalPath() + u'/' + resource);
+        if (resource.size() > options.pythonRoot.size())
+            resource.remove(0, options.pythonRoot.size() + 1);
+    }
+    // If nothing is known, we assume the directory pointed by "../" is the root
+    while (resource.startsWith(u"../"))
+        resource.remove(0, 3);
+    resource.replace(u'/', u'.');
+    return resource;
+}
+
+void WriteImports::writeResourceImport(const QString &module)
+{
+    const auto &options = uic()->option();
+    auto &str = uic()->output();
+
+    QString resource = QDir::cleanPath(module);
+    if (resource.endsWith(u".qrc"))
+        resource.chop(4);
+    const qsizetype basePos = resource.lastIndexOf(u'/') + 1;
+    // Change the name of a qrc file "dir/foo.qrc" file to the Python
+    // module name "foo_rc" according to project conventions.
+    if (options.rcPrefix)
+        resource.insert(basePos, u"rc_");
+    else
+        resource.append(u"_rc");
+
+    switch (options.pythonResourceImport) {
+    case Option::PythonResourceImport::Default:
+        str << "import " << QStringView{resource}.sliced(basePos) << '\n';
+        break;
+    case Option::PythonResourceImport::FromDot:
+        str << "from . import " << QStringView{resource}.sliced(basePos) << '\n';
+        break;
+    case Option::PythonResourceImport::Absolute:
+        str << "import " << resourceAbsolutePath(resource) << '\n';
+        break;
+    }
 }
 
 void WriteImports::doAdd(const QString &className, const DomCustomWidget *dcw)
@@ -201,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 <customwidget>
-        if (modulePath.endsWith(".h"_L1))
+        // '.h' is added by default on headers for <customwidget>.
+        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);
     }
 }