diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-05-26 18:20:00 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-06-24 16:25:02 +0200 |
| commit | d17157f83a98d949beec849df584dd3233187ea4 (patch) | |
| tree | 7db5ab186fb935680c0d3457a629b5bf1d2af414 /src/libs/qmljs/qmljsmodelmanagerinterface.cpp | |
| parent | 34f48ea0c0a59c4be995a8a92171c7fd216fd59c (diff) | |
| download | qt-creator-d17157f83a98d949beec849df584dd3233187ea4.tar.gz | |
qmljs: fix qml scan sequence and progress
Change-Id: I8aafb23f1708400936507ab75e4c2893906f9aff
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 4692a50528..34ca7fa672 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -954,7 +954,7 @@ void ModelManagerInterface::importScan(QFutureInterface<void> &future, while (!pathsToScan.isEmpty() && !future.isCanceled()) { ScanItem toScan = pathsToScan.last(); pathsToScan.pop_back(); - int pathBudget = (maxScanDepth + 2 - toScan.depth); + int pathBudget = (1 << (maxScanDepth + 2 - toScan.depth)); if (!scannedPaths.contains(toScan.path)) { QStringList importedFiles; if (!findNewQmlLibraryInPath(toScan.path, snapshot, modelManager, &importedFiles, @@ -979,7 +979,7 @@ void ModelManagerInterface::importScan(QFutureInterface<void> &future, // always descend tree, as we might have just scanned with a smaller depth if (toScan.depth < maxScanDepth) { QDir dir(toScan.path); - QStringList subDirs(dir.entryList(QDir::Dirs)); + QStringList subDirs(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)); workDone += 1; totalWork += pathBudget / 2 * subDirs.size() - pathBudget * 3 / 4 + 1; foreach (const QString path, subDirs) |