diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:40:34 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 13:40:34 (GMT) |
| commit | 2c4bbeecd084bf4565643d4cd42de3be1aed5681 (patch) | |
| tree | dc40f7bba6c74248c9a0359b05b39bce0e6decb2 /src/testlib/qbenchmarkvalgrind.cpp | |
| parent | d1c5585faa066a6693c24600cf8a1c42a285fe3b (diff) | |
| parent | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (diff) | |
| download | Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.zip Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.tar.gz Qt-2c4bbeecd084bf4565643d4cd42de3be1aed5681.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tools/configure/configureapp.cpp
Diffstat (limited to 'src/testlib/qbenchmarkvalgrind.cpp')
| -rw-r--r-- | src/testlib/qbenchmarkvalgrind.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp index 3398737..88cb37f 100644 --- a/src/testlib/qbenchmarkvalgrind.cpp +++ b/src/testlib/qbenchmarkvalgrind.cpp @@ -114,7 +114,7 @@ qint64 QBenchmarkValgrindUtils::extractResult(const QString &fileName) while (!file.atEnd()) { const QString line(QLatin1String(file.readLine())); if (rxValue.indexIn(line) != -1) { - Q_ASSERT(rxValue.numCaptures() == 1); + Q_ASSERT(rxValue.captureCount() == 1); bool ok; val = rxValue.cap(1).toLongLong(&ok); Q_ASSERT(ok); |