diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
| commit | 0e7e62eb6afbc1f20d08b837643009cec8eaacb9 (patch) | |
| tree | 1eb5f9fb0194b8a9ffa1d9ab961a0ac68db7508a /demos | |
| parent | b88bcd68a62ab8ed348bc698f7342346963bb7c0 (diff) | |
| parent | 421e02d7b48b4a852a4aa1e6feb781a64f0981b4 (diff) | |
| download | Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.zip Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.gz Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.bz2 | |
Merge commit 'origin/4.6' into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/spreadsheet/spreadsheet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp index 0449a91..7f057a2 100644 --- a/demos/spreadsheet/spreadsheet.cpp +++ b/demos/spreadsheet/spreadsheet.cpp @@ -420,7 +420,7 @@ void SpreadSheet::actionMath_helper(const QString &title, const QString &op) &cell1, &cell2, &out)) { int row, col; decode_pos(out, &row, &col); - table->item(row, col)->setText(tr("%1, %2, %3").arg(op, cell1, cell2)); + table->item(row, col)->setText(tr("%1 %2 %3").arg(op, cell1, cell2)); } } |