diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2009-08-28 17:49:40 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2009-08-28 17:51:40 (GMT) |
| commit | 850a179f0f879a37302780148dd1900fc5a69d3b (patch) | |
| tree | e8f17199f51c33e77cdf1ff5bf4a2d6ddf6469d8 | |
| parent | 93232a4283cf2fc1e64fe63f70ac3fb0250c8b23 (diff) | |
| download | Qt-850a179f0f879a37302780148dd1900fc5a69d3b.zip Qt-850a179f0f879a37302780148dd1900fc5a69d3b.tar.gz Qt-850a179f0f879a37302780148dd1900fc5a69d3b.tar.bz2 | |
Added a default theme for the simulated S60 style
Reviewed-By: Trustme
| -rw-r--r-- | src/gui/styles/images/defaults60theme.blob | bin | 0 -> 74127 bytes | |||
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 3 | ||||
| -rw-r--r-- | src/gui/styles/qstyle_s60_simulated.qrc | 2 | ||||
| -rw-r--r-- | src/gui/styles/styles.pri | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/styles/images/defaults60theme.blob b/src/gui/styles/images/defaults60theme.blob Binary files differnew file mode 100644 index 0000000..f3a5952 --- /dev/null +++ b/src/gui/styles/images/defaults60theme.blob 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 |