diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-01-27 10:47:01 (GMT) |
commit | dd8a0d85b070c363c8e4575ec967ae0ad8dfebec (patch) | |
tree | 5901a878931bbd3c4bffed0b0dba332af5e04181 /src/gui/styles/styles.pri | |
parent | c0160230c4fd6f226d0c5ddabe3762f5fa855768 (diff) | |
parent | ec90f6ed28ec735ce963c4257ea1095ecbc6c6ba (diff) | |
download | Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.zip Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.gz Qt-dd8a0d85b070c363c8e4575ec967ae0ad8dfebec.tar.bz2 |
Merge commit 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/styles.pri')
-rw-r--r-- | src/gui/styles/styles.pri | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index 7e5c55a..676f59e 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -23,10 +23,12 @@ SOURCES += \ styles/qstylesheetstyle.cpp \ styles/qstylesheetstyle_default.cpp -!wince* { - RESOURCES += styles/qstyle.qrc +wince* { + RESOURCES += styles/qstyle_wince.qrc +} else:symbian { + RESOURCES += styles/qstyle_s60.qrc } else { - RESOURCES += styles/qstyle_wince.qrc + RESOURCES += styles/qstyle.qrc } contains( styles, all ) { @@ -168,7 +170,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) { SOURCES += styles/qs60style.cpp symbian { SOURCES += styles/qs60style_s60.cpp - LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul + LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul -lbmpanim } else { SOURCES += styles/qs60style_simulated.cpp RESOURCES += styles/qstyle_s60_simulated.qrc |