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 /examples/tools/regexp/regexpdialog.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 'examples/tools/regexp/regexpdialog.cpp')
| -rw-r--r-- | examples/tools/regexp/regexpdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/tools/regexp/regexpdialog.cpp b/examples/tools/regexp/regexpdialog.cpp index 08c7a97..3becc2b 100644 --- a/examples/tools/regexp/regexpdialog.cpp +++ b/examples/tools/regexp/regexpdialog.cpp @@ -180,8 +180,8 @@ void RegExpDialog::refresh() indexEdit->setText(QString::number(rx.indexIn(text))); matchedLengthEdit->setText(QString::number(rx.matchedLength())); for (int i = 0; i < MaxCaptures; ++i) { - captureLabels[i]->setEnabled(i <= rx.numCaptures()); - captureEdits[i]->setEnabled(i <= rx.numCaptures()); + captureLabels[i]->setEnabled(i <= rx.captureCount()); + captureEdits[i]->setEnabled(i <= rx.captureCount()); captureEdits[i]->setText(rx.cap(i)); } |