diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:54:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 16:54:32 (GMT) |
| commit | e923d66d4999117081ae40092a9dbba72d880810 (patch) | |
| tree | 5cdb18ea6f503c400c7eac02ee3d0befce525cd7 | |
| parent | 1dffae94302099f1e6d1eb5835e46239f7b8f2a5 (diff) | |
| parent | fe17f36823d0b2374e3ec7badb4c2ed2c938dba8 (diff) | |
| download | Qt-e923d66d4999117081ae40092a9dbba72d880810.zip Qt-e923d66d4999117081ae40092a9dbba72d880810.tar.gz Qt-e923d66d4999117081ae40092a9dbba72d880810.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix minor memory leak
Remove unused variable
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/io/qprocess_symbian.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index c4b51f2..c219f1d 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -377,7 +377,6 @@ void SymbianSbsv2MakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, boo t << qmakeCmd << endl; t << endl; - QString currentClause; QString locFileDep = generateLocFileTarget(t, qmakeCmd); t << "debug: " << locFileDep << BLD_INF_FILENAME << endl; 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; } |