Merge remote-tracking branch 'origin/4.12' into 4.13

Conflicts:
	share/qtcreator/debugger/lldbbridge.py

Change-Id: Ia444f6424fb35b9a539e157afcee868161535272

src/libs/qmljs/qmljsmodelmanagerinterface.cpp

@@ -1622,10 +1622,15 @@ void ModelManagerInterface::resetCodeModel()
         // reset the snapshot
         m_validSnapshot = Snapshot();
         m_newestSnapshot = Snapshot();
+        m_scannedPaths.clear();
     }
 
     // start a reparse thread
     updateSourceFiles(documents, false);
+
+    // rescan import directories
+    m_shouldScanImports = true;
+    updateImportPaths();
 }
 
 } // namespace QmlJS