diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-28 16:13:16 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-28 16:13:16 (GMT) |
| commit | b383ff766764f4d0d9644ca06bfb049d62bdcf2f (patch) | |
| tree | 3d8fbe861d3618bd37b33e25a697a6bfa6614e46 /src/gui/styles/styles.pri | |
| parent | 0585997b7dbe25ece9f60684171c16206d10d65f (diff) | |
| parent | 7c2000060bbc152ae32594f3d4dd60bd3351dab0 (diff) | |
| download | Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.zip Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.gz Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
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 |