diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-11 00:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-11 00:00:11 (GMT) |
| commit | 9192dbe2781d9891d41c05f52d19b2d94b2b5f94 (patch) | |
| tree | f0b470d53e5fccae99f40d9f60cb43bfb0b29c10 /src/corelib | |
| parent | f6c23d7874043ca67ae7e8b87d7948e7c710fc53 (diff) | |
| parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
| download | Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.zip Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.tar.gz Qt-9192dbe2781d9891d41c05f52d19b2d94b2b5f94.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qprocess_symbian.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qalgorithms.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp index 003e781..5b283a5 100644 --- a/src/corelib/io/qprocess_symbian.cpp +++ b/src/corelib/io/qprocess_symbian.cpp @@ -1050,6 +1050,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a newProc->Resume(); newProc->Close(); + delete newProc; return true; } diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index 898f940..cd33f28 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -266,7 +266,7 @@ \overload - This is the same as qFind(\a{container}.begin(), \a{container}.end(), value); + This is the same as qFind(\a{container}.constBegin(), \a{container}.constEnd(), value); */ /*! \fn void qCount(InputIterator begin, InputIterator end, const T &value, Size &n) |