From 850a179f0f879a37302780148dd1900fc5a69d3b Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 28 Aug 2009 19:49:40 +0200
Subject: Added a default theme for the simulated S60 style

Reviewed-By: Trustme
---
 src/gui/styles/images/defaults60theme.blob | Bin 0 -> 74127 bytes
 src/gui/styles/qs60style_simulated.cpp     |   3 +--
 src/gui/styles/qstyle_s60_simulated.qrc    |   2 +-
 src/gui/styles/styles.pri                  |   1 +
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/gui/styles/images/defaults60theme.blob

diff --git a/src/gui/styles/images/defaults60theme.blob b/src/gui/styles/images/defaults60theme.blob
new file mode 100644
index 0000000..f3a5952
Binary files /dev/null and b/src/gui/styles/images/defaults60theme.blob differ
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 350ef51..2d185bd 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -366,8 +366,7 @@ QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCate
 QS60Style::QS60Style()
     : QCommonStyle(*new QS60StylePrivate)
 {
-    // Assume, that the resource system has a ':/s60Stylethemes/Default.blob'
-    const QString defaultBlob = QString::fromLatin1(":/s60Stylethemes/Default.blob");
+    const QString defaultBlob = QString::fromLatin1(":/trolltech/styles/s60style/images/defaults60theme.blob");
     if (QFile::exists(defaultBlob))
         loadS60ThemeFromBlob(defaultBlob);
 }
diff --git a/src/gui/styles/qstyle_s60_simulated.qrc b/src/gui/styles/qstyle_s60_simulated.qrc
index 72aab9e..969732e 100644
--- a/src/gui/styles/qstyle_s60_simulated.qrc
+++ b/src/gui/styles/qstyle_s60_simulated.qrc
@@ -1,6 +1,6 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
     <qresource prefix="/trolltech/styles/s60style">
-        <file>images/s60themes.dat</file>
+        <file>images/defaults60theme.blob</file>
     </qresource>
 </RCC>
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 7e725c0..767ade0 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -171,6 +171,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) {
 		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
 	} else {
 		SOURCES += styles/qs60style_simulated.cpp
+		RESOURCES += styles/qstyle_s60_simulated.qrc
 	}
 } else {
 	DEFINES += QT_NO_STYLE_S60
-- 
cgit v0.12