summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-06-08 16:17:54 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-06-08 17:30:23 (GMT)
commitb84811da86a7c3c9be153a2c4f9a52a759bc70d0 (patch)
tree8f1b7924935d4f508f17b0045b0af52c18bddaf7
parent806e0081bf8c77d990e4b0fafdec93f07bdcbfab (diff)
downloadQt-b84811da86a7c3c9be153a2c4f9a52a759bc70d0.zip
Qt-b84811da86a7c3c9be153a2c4f9a52a759bc70d0.tar.gz
Qt-b84811da86a7c3c9be153a2c4f9a52a759bc70d0.tar.bz2
More usable output of the s60theme utility
-rw-r--r--util/s60theme/s60theme.pro3
-rw-r--r--util/s60theme/s60themeconvert.cpp7
2 files changed, 7 insertions, 3 deletions
diff --git a/util/s60theme/s60theme.pro b/util/s60theme/s60theme.pro
index 02c2449..83c0cf2 100644
--- a/util/s60theme/s60theme.pro
+++ b/util/s60theme/s60theme.pro
@@ -7,3 +7,6 @@ HEADERS += \
QT += \
webkit
+
+CONFIG += \
+ console
diff --git a/util/s60theme/s60themeconvert.cpp b/util/s60theme/s60themeconvert.cpp
index 4fe2980..a1e1d58 100644
--- a/util/s60theme/s60themeconvert.cpp
+++ b/util/s60theme/s60themeconvert.cpp
@@ -206,7 +206,7 @@ bool loadThemeFromTdf(const QString &tdfFile,
const QString tdfFullName =
tdfBasePath + QDir::separator() + parsedPartSvgs.value(partKey);
if (!QFile(tdfFullName).exists())
- qWarning() << "Could not load part " << tdfFullName;
+ qWarning() << "Could not find part:" << parsedPartSvgs.value(partKey);
const QPicture partPicture = renderer.svgToQPicture(tdfFullName);
parsedPartPictures.insert(partKey, partPicture);
}
@@ -273,9 +273,10 @@ bool loadDefaultTheme(const QString &themePath,
WebKitSVGRenderer renderer;
foreach (const QString &partKey, QS60Style::partKeys()) {
- const QString partFile(dir.absolutePath() + QDir::separator() + partKey + QLatin1String(".svg"));
+ const QString partFileName = partKey + QLatin1String(".svg");
+ const QString partFile(dir.absolutePath() + QDir::separator() + partFileName);
if (!QFile::exists(partFile)) {
- qWarning() << "Could not load part " << partFile;
+ qWarning() << "Could not find part:" << partFileName;
continue;
}
const QPicture partPicture = renderer.svgToQPicture(partFile);