TypeDescriptionReader: Don't export C++ names as QML names

This is just wrong. The types are not visible in QML under their C++
names. Indeed, this way we reveal a number of places where we confuse
the names. Fix those in turn.

Furthermore, one of the tests was incorrect. The qmltypes files did not
contain an export entry for one of the types, and therefore the type was
formally anonymous in QML. However, we did access it via its C++ name.
Fix that by exporting the C++ name.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/tools/qmllint/checkidentifiers.h b/tools/qmllint/checkidentifiers.h
index 8fd605f454..653b398301 100644
--- a/tools/qmllint/checkidentifiers.h
+++ b/tools/qmllint/checkidentifiers.h
@@ -30,14 +30,15 @@
 #define CHECKIDENTIFIERS_H
 
 #include "scopetree.h"
+#include "findwarnings.h"
 
 class ColorOutput;
 
 class CheckIdentifiers
 {
 public:
-    CheckIdentifiers(ColorOutput *colorOut, const QString &code, const QHash<QString,
-                     ScopeTree::Ptr> &types, const QString &fileName) :
+    CheckIdentifiers(ColorOutput *colorOut, const QString &code,
+                     const FindWarningVisitor::ImportedTypes &types, const QString &fileName) :
         m_colorOut(colorOut), m_code(code), m_types(types), m_fileName(fileName)
     {}
 
@@ -52,7 +53,7 @@ private:
 
     ColorOutput *m_colorOut = nullptr;
     QString m_code;
-    QHash<QString, ScopeTree::Ptr> m_types;
+    FindWarningVisitor::ImportedTypes m_types;
     QString m_fileName;
 };