diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
| commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
| tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /examples/widgets/doc/src/calculator.qdoc | |
| parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
| parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'examples/widgets/doc/src/calculator.qdoc')
| -rw-r--r-- | examples/widgets/doc/src/calculator.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/doc/src/calculator.qdoc b/examples/widgets/doc/src/calculator.qdoc index 5af52a75c9..4ee1248e6c 100644 --- a/examples/widgets/doc/src/calculator.qdoc +++ b/examples/widgets/doc/src/calculator.qdoc @@ -261,7 +261,7 @@ \snippet widgets/calculator/calculator.cpp 20 - Like in \c additiveOperatorClicked(), we start by handing any + Like in \c additiveOperatorClicked(), we start by handling any pending multiplicative and additive operators. Then we display \c sumSoFar and reset the variable to zero. Resetting the variable to zero is necessary to avoid counting the value twice. |