diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp
index de18b8328d615bf6cf81d16b6c00d2d7745ca289..216fd7a738eb4e9d8d261dbe72f8f41431b40204 100644
--- a/src/libs/qmljs/qmljsdocument.cpp
+++ b/src/libs/qmljs/qmljsdocument.cpp
@@ -47,10 +47,10 @@ Document::Document(const QString &fileName)
     , _isQmlDocument(false)
     , _documentRevision(0)
     , _parsedCorrectly(false)
-    , _fileName(fileName)
+    , _fileName(QDir::cleanPath(fileName))
 {
     QFileInfo fileInfo(fileName);
-    _path = fileInfo.absolutePath();
+    _path = QDir::cleanPath(fileInfo.absolutePath());
 
     // ### Should use mime type
     if (fileInfo.suffix() == QLatin1String("qml")
@@ -258,7 +258,7 @@ void Snapshot::insert(const Document::Ptr &document)
 
 void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info)
 {
-    _libraries.insert(path, info);
+    _libraries.insert(QDir::cleanPath(path), info);
 }
 
 Document::Ptr Snapshot::documentFromSource(const QString &code,
@@ -314,3 +314,18 @@ QMap<QString, Document::Ptr> Snapshot::componentsDefinedByImportedDocuments(cons
 
     return result;
 }
+
+Document::Ptr Snapshot::document(const QString &fileName) const
+{
+    return _documents.value(QDir::cleanPath(fileName));
+}
+
+QList<Document::Ptr> Snapshot::documentsInDirectory(const QString &path) const
+{
+    return _documentsByPath.values(QDir::cleanPath(path));
+}
+
+LibraryInfo Snapshot::libraryInfo(const QString &path) const
+{
+    return _libraries.value(QDir::cleanPath(path));
+}
diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index 2a1469c1dadf1c6433cdc8797c304c55c24dbd91..c81c513290267ac1ee87ecb2597e562d757cee33 100644
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -149,14 +149,9 @@ public:
     void insert(const Document::Ptr &document);
     void insertLibraryInfo(const QString &path, const LibraryInfo &info);
 
-    Document::Ptr document(const QString &fileName) const
-    { return _documents.value(fileName); }
-
-    QList<Document::Ptr> documentsInDirectory(const QString &path) const
-    { return _documentsByPath.values(path); }
-
-    LibraryInfo libraryInfo(const QString &path) const
-    { return _libraries.value(path); }
+    Document::Ptr document(const QString &fileName) const;
+    QList<Document::Ptr> documentsInDirectory(const QString &path) const;
+    LibraryInfo libraryInfo(const QString &path) const;
 
     Document::Ptr documentFromSource(const QString &code,
                                      const QString &fileName) const;