qmltyperegistrar: Accept more file extensions as headers

Also, even if the file does not appear to be a header, still try to
include it. People use strange file names.

Change-Id: I2db7bd6aa14007a8b458c3860ba0553bb3b384b7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/qmltyperegistrar/qmltyperegistrar.cpp b/src/qmltyperegistrar/qmltyperegistrar.cpp
index 6154d87e99..282fa9251b 100644
--- a/src/qmltyperegistrar/qmltyperegistrar.cpp
+++ b/src/qmltyperegistrar/qmltyperegistrar.cpp
@@ -307,16 +307,19 @@ int main(int argc, char **argv)
                 case GadgetRegistration:
                 case ObjectRegistration: {
                     const QString include = metaObject[QLatin1String("inputFile")].toString();
-                    const bool declaredInHeader = include.endsWith(QLatin1String(".h"));
-                    if (declaredInHeader) {
-                        includes.append(include);
-                        classDef.insert(QLatin1String("registerable"), true);
-                    } else {
-                        fprintf(stderr, "Cannot generate QML type registration for class %s "
-                                        "because it is not declared in a header.",
+                    if (!include.endsWith(QLatin1String(".h"))
+                            && !include.endsWith(QLatin1String(".hpp"))
+                            && !include.endsWith(QLatin1String(".hxx"))
+                            && include.contains(QLatin1Char('.'))) {
+                        fprintf(stderr,
+                                "Class %s is declared in %s, which appears not to be a header.\n"
+                                "The compilation of its registration to QML may fail.\n",
                                 qPrintable(classDef.value(QLatin1String("qualifiedClassName"))
-                                           .toString()));
+                                           .toString()),
+                                qPrintable(include));
                     }
+                    includes.append(include);
+                    classDef.insert(QLatin1String("registerable"), true);
 
                     types.append(classDef);
                     break;