diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-07-06 16:23:13 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-07-06 16:23:13 +0200 |
| commit | b18711da91a01709f64c4b7d132509aa21ebe0da (patch) | |
| tree | dc82d508be7bec62a21548405dff510f19e3a17e /src/libs | |
| parent | c1df1e5d2e8805c4f38872b11bc30bbe72064ede (diff) | |
| parent | d35cf4b846a914303675a21300b79dc860e6f73f (diff) | |
Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
share/qtcreator/debugger/lldbbridge.py
Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 9189ea7e3c7..dc4c855c263 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/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 |