diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 12:35:08 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 12:35:08 (GMT) |
commit | d88a7e7a76deaa0c0e36d94a001d6f64834e22c2 (patch) | |
tree | 80b604a84c06efaa36ddf5e6eb324caf8aea66b0 /src/gui/styles/styles.pri | |
parent | 645f29c727f33cc9f8b00b8efcb658a050ac6a26 (diff) | |
parent | f17aeadf56818e5f20e20eb91450e66adb88c99b (diff) | |
download | Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.zip Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.gz Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.bz2 |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/corelib/global/qglobal.cpp
src/gui/dialogs/dialogs.pri
Diffstat (limited to 'src/gui/styles/styles.pri')
-rw-r--r-- | src/gui/styles/styles.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index 9fb3928..8208581 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -168,7 +168,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) { SOURCES += styles/qs60style.cpp symbian { SOURCES += styles/qs60style_s60.cpp - LIBS += -laknicon -laknskins -laknskinsrv -lfontutils + LIBS += -laknicon -laknskins -laknskinsrv -lfontutils -legul } else { SOURCES += styles/qs60style_simulated.cpp RESOURCES += styles/qstyle_s60_simulated.qrc |