summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-10-09 00:32:00 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-10-09 00:32:00 (GMT)
commitccb3f7c3bda46ace7b42bff5a27a11bd07602b68 (patch)
tree8b4b33f05fa16814766550f1d064567531b8796a /tools
parent05e4f1eaeb3f916bcf845ae0d7e85d283e9ca1bd (diff)
parentdb531c30eb73ff7aeac9cf07b06d6a108b2c13ec (diff)
downloadQt-ccb3f7c3bda46ace7b42bff5a27a11bd07602b68.zip
Qt-ccb3f7c3bda46ace7b42bff5a27a11bd07602b68.tar.gz
Qt-ccb3f7c3bda46ace7b42bff5a27a11bd07602b68.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/qfxtester.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp
index a6a46eb..8005b0e 100644
--- a/tools/qmlviewer/qfxtester.cpp
+++ b/tools/qmlviewer/qfxtester.cpp
@@ -140,7 +140,8 @@ void QFxTester::run()
void QFxTester::save()
{
QString filename = m_script + QLatin1String(".qml");
- QDir saveDir = QFileInfo(filename).absoluteDir();
+ QFileInfo filenameInfo(filename);
+ QDir saveDir = filenameInfo.absoluteDir();
saveDir.mkpath(".");
QFile file(filename);
@@ -160,8 +161,9 @@ void QFxTester::save()
if (!fe.hash.isEmpty()) {
ts << " hash: \"" << fe.hash.toHex() << "\"\n";
} else if (!fe.image.isNull()) {
- QString filename = m_script + "." + QString::number(imgCount++) + ".png";
- fe.image.save(filename);
+ QString filename = filenameInfo.baseName() + "." + QString::number(imgCount) + ".png";
+ fe.image.save(m_script + "." + QString::number(imgCount) + ".png");
+ imgCount++;
ts << " image: \"" << filename << "\"\n";
}
ts << " }\n";