summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-15 16:24:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-15 16:24:00 (GMT)
commit1c38e7c2107b7cb7ff997126ded3819d760a3191 (patch)
treef4f378a1ddb6ffb5e4c48931ed4da0ff8e1fb2e8 /util
parentc2f542ee646b8e4bd87e6078dc9c83b661229f41 (diff)
parent05231f486b93dfb3992bfb96568f8c71d877e104 (diff)
downloadQt-1c38e7c2107b7cb7ff997126ded3819d760a3191.zip
Qt-1c38e7c2107b7cb7ff997126ded3819d760a3191.tar.gz
Qt-1c38e7c2107b7cb7ff997126ded3819d760a3191.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 epocroot handling in createpackage.pl script Make s60pixelmetrics harvester utility app more robust Implemented Qt::WA_ShowWithoutActivating for Symbian. Clean up ARM SIMD drawhelper code and make sure it works.
Diffstat (limited to 'util')
-rw-r--r--util/s60pixelmetrics/pm_mapperapp.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index a88499d..d68a0b0 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -166,6 +166,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
else
bufferPtr.Append(_L("screen."));
ShowL( *buffer, last );
+ CleanupStack::PopAndDestroy( buffer );
}
break;
case ECmdStatus:
@@ -257,7 +258,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
bufferPtr.Append(_L("Orientation cannot be changed."));
ShowL( *buffer, last );
bufferPtr.Zero();
- delete buffer;
+ CleanupStack::PopAndDestroy( buffer );
break;
}
#endif //__SERIES60_31__
@@ -278,7 +279,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
bufferPtr.Append(_L("Orientation changed."));
ShowL( *buffer, last );
bufferPtr.Zero();
- delete buffer;
+ CleanupStack::PopAndDestroy( buffer );
break;
}
case ECmdStartCalculations:
@@ -787,11 +788,14 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
CleanupStack::PopAndDestroy(); //sourceFile
}
- bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2);
- bufferPMData = bufferPMData.Left(bufferPMData.Length()-2);
- textFile.Write(bufferLayoutHdr);
- textFile.Write(KCRLF);
- textFile.Write(bufferPMData);
+ if (fileCount > 0)
+ {
+ bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2);
+ bufferPMData = bufferPMData.Left(bufferPMData.Length()-2);
+ textFile.Write(bufferLayoutHdr);
+ textFile.Write(KCRLF);
+ textFile.Write(bufferPMData);
+ }
delete dirList;
CleanupStack::PopAndDestroy(); //file