qmllint: Handle the default import and .ui.qml files

Change-Id: I9d86daa737d30ea0f76af431c59f44d59d4786e4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 42 insertions, 14 deletions

diff --git a/tests/auto/qml/qmllint/data/Form.ui.qml b/tests/auto/qml/qmllint/data/Form.ui.qml
new file mode 100644
index 0000000000..459c82afbb
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/Form.ui.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.0
+
+Item {
+}
diff --git a/tests/auto/qml/qmllint/data/FormUser.qml b/tests/auto/qml/qmllint/data/FormUser.qml
new file mode 100644
index 0000000000..ea3621586f
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/FormUser.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+Form {
+    x: 12
+    y: 13
+    objectName: "horst"
+}
diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp
index c1d45ddaf1..8233dbebe5 100644
--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
+++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
@@ -45,6 +45,7 @@ private Q_SLOTS:
     void testUnqualifiedNoSpuriousParentWarning();
     void catchIdentifierNoFalsePositive();
     void testUnmatchedSignalHandler();
+    void uiQml();
 
 private:
     QString runQmllint(const QString &fileToLint, bool shouldSucceed);
@@ -136,6 +137,12 @@ void TestQmllint::testUnmatchedSignalHandler()
     QVERIFY(!output.contains(QStringLiteral("onMouseXChanged")));
 }
 
+void TestQmllint::uiQml()
+{
+    const QString output = runQmllint("FormUser.qml", true);
+    QVERIFY(output.isEmpty());
+}
+
 void TestQmllint::test()
 {
     QFETCH(QString, filename);
diff --git a/tools/qmllint/findunqualified.cpp b/tools/qmllint/findunqualified.cpp
index fffb1d06fa..42c74059c3 100644
--- a/tools/qmllint/findunqualified.cpp
+++ b/tools/qmllint/findunqualified.cpp
@@ -170,7 +170,8 @@ FindUnqualifiedIDVisitor::localQmlFile2FakeMetaObject(QString filePath)
 {
     using namespace QQmlJS::AST;
     auto fake = new LanguageUtils::FakeMetaObject;
-    fake->setClassName(QFileInfo { filePath }.baseName());
+    QString baseName = QFileInfo { filePath }.baseName();
+    fake->setClassName(baseName.endsWith(".ui") ? baseName.chopped(3) : baseName);
     QFile file(filePath);
     if (!file.open(QFile::ReadOnly)) {
         return fake;
@@ -304,6 +305,22 @@ FindUnqualifiedIDVisitor::localQmlFile2FakeMetaObject(QString filePath)
     return fake;
 }
 
+void FindUnqualifiedIDVisitor::importDirectory(const QString &directory, const QString &prefix)
+{
+    QString dirname = directory;
+    QFileInfo info { dirname };
+    if (info.isRelative())
+        dirname = QDir(QFileInfo { m_filePath }.path()).filePath(dirname);
+
+    QDirIterator it { dirname, QStringList() << QLatin1String("*.qml"), QDir::NoFilter };
+    while (it.hasNext()) {
+        LanguageUtils::FakeMetaObject *fake = localQmlFile2FakeMetaObject(it.next());
+        m_exportedName2MetaObject.insert(
+                fake->className(),
+                QSharedPointer<const LanguageUtils::FakeMetaObject>(fake));
+    }
+}
+
 void FindUnqualifiedIDVisitor::importExportedNames(QStringRef prefix, QString name)
 {
     for (;;) {
@@ -377,6 +394,8 @@ bool FindUnqualifiedIDVisitor::visit(QQmlJS::AST::UiProgram *)
     meta->addProperty(LanguageUtils::FakeMetaProperty {"ignoreUnknownSignals", "bool", false, false, false, 0});
     meta->addProperty(LanguageUtils::FakeMetaProperty {"target", "QObject", false, false, false, 0});
     m_exportedName2MetaObject["Connections"] = LanguageUtils::FakeMetaObject::ConstPtr { meta };
+
+    importDirectory(".", QString());
     return true;
 }
 
@@ -672,18 +691,9 @@ bool FindUnqualifiedIDVisitor::visit(QQmlJS::AST::UiImport *import)
         prefix += import->importId + QLatin1Char('.');
     }
     auto dirname = import->fileName.toString();
-    if (!dirname.isEmpty()) {
-        QFileInfo info { dirname };
-        if (info.isRelative()) {
-            dirname = QDir(QFileInfo { m_filePath }.path()).filePath(dirname);
-        }
-        QDirIterator it { dirname, QStringList() << QLatin1String("*.qml"), QDir::NoFilter };
-        while (it.hasNext()) {
-            LanguageUtils::FakeMetaObject *fake = localQmlFile2FakeMetaObject(it.next());
-            m_exportedName2MetaObject.insert(
-                    fake->className(), QSharedPointer<const LanguageUtils::FakeMetaObject>(fake));
-        }
-    }
+    if (!dirname.isEmpty())
+        importDirectory(dirname, prefix);
+
     QString path {};
     if (!import->importId.isEmpty()) {
         m_qmlid2meta.insert(import->importId.toString(), {}); // TODO: do not put imported ids into the same space as qml IDs
diff --git a/tools/qmllint/findunqualified.h b/tools/qmllint/findunqualified.h
index 181f42f265..f7d1aab1f4 100644
--- a/tools/qmllint/findunqualified.h
+++ b/tools/qmllint/findunqualified.h
@@ -70,7 +70,7 @@ private:
     void importHelper(QString id, QString prefix, int major, int minor);
     LanguageUtils::FakeMetaObject* localQmlFile2FakeMetaObject(QString filePath);
 
-
+    void importDirectory(const QString &directory, const QString &prefix);
     void importExportedNames(QStringRef prefix, QString name);
 
     void throwRecursionDepthError() override;