summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qscopedpointer.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-10-09 15:50:11 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-09 15:50:11 +0200
commitda0cb32b8ee7cc4a991a59420a411898e63a660e (patch)
tree9ed8e190a6543518f9b082afc5a380f659da0220 /src/corelib/tools/qscopedpointer.cpp
parent7f3e3c1099f42cff46bbd267c70587bcf72024fc (diff)
parentd8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qscopedpointer.cpp')
-rw-r--r--src/corelib/tools/qscopedpointer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index fb0025c1ff9..e0c369ecad7 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
QScopedPointer guarantees that the object pointed to will get deleted when
the current scope disappears.
- Consider this function which does heap allocations, and have various exit points:
+ Consider this function which does heap allocations, and has various exit points:
\snippet code/src_corelib_tools_qscopedpointer.cpp 0