summaryrefslogtreecommitdiff
path: root/src/libs/utils/filesearch.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-04-02 17:02:27 +0200
committerChristian Stenger <christian.stenger@theqtcompany.com>2015-04-08 05:10:49 +0000
commitf311eff157a9519fb9067ce3cc60d64c1e171e55 (patch)
tree24e4f9ec65f8825c597ab56be4aa9ced5a439a9c /src/libs/utils/filesearch.cpp
parent789f3d6ca2ad717da95df7d87c1a66b0ca1a7ff9 (diff)
downloadqt-creator-f311eff157a9519fb9067ce3cc60d64c1e171e55.tar.gz
FileSearch: Fix wrong line number for RegExp search.
Introduced by recent refactoring Change-Id: Ifb7300549ce1791a90d287d5d8dd66f7d2217755 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/libs/utils/filesearch.cpp')
-rw-r--r--src/libs/utils/filesearch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 3beb3855df..0219f73d10 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -207,6 +207,7 @@ const FileSearchResultList FileSearchRegExp::operator()(const QString &filePath,
QString line;
while (!stream.atEnd()) {
+ ++lineNr;
line = stream.readLine();
const QString resultItemText = clippedText(line, MAX_LINE_SIZE);
int lengthOfLine = line.size();
@@ -221,7 +222,6 @@ const FileSearchResultList FileSearchRegExp::operator()(const QString &filePath,
if (pos >= lengthOfLine)
break;
}
- ++lineNr;
if (future->isPaused())
future->waitForResume();
if (future->isCanceled())