diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-14 01:00:21 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-03-14 10:49:29 +0100 |
| commit | 32084b073362e52df597cc388cf54f5173e20b0d (patch) | |
| tree | 9a6f881f0ab0bc22e3a491fae81d494815cc514f /src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp | |
| parent | 8d4e8217fdc01417ab8ea33303dd0ce7f769d10e (diff) | |
| parent | eb25acc05b177c49eb81b190a476854fbf3c6fb1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qcollator_win.cpp
Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5
Diffstat (limited to 'src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp index c8c5f694c6..2fa4f88011 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qscopeguard.cpp @@ -57,7 +57,7 @@ void myComplexCodeWithMultipleReturnPoints(int v) if (v == -1) return; - int v2 = code_that_might_through_exceptions(); + int v2 = code_that_might_throw_exceptions(); if (v2 == -1) return; |