diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:31:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:31:23 (GMT) |
| commit | 6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf (patch) | |
| tree | 0b509797aa2cfa1b252f869c972c8166da3d07f8 /src/gui | |
| parent | e31fd006d30f4b45cc592b2bb549b63d2c7e6832 (diff) | |
| parent | 5933d4e4fb8b48ebed641e7f6b1d032df253df30 (diff) | |
| download | Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.zip Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.tar.gz Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing Linux compatibility issues for Symbian
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 2 | ||||
| -rw-r--r-- | src/gui/styles/styles.pri | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index 12e3a71..c25b6d5 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -109,7 +109,7 @@ SOURCES += \ dialogs/qprintpreviewdialog.cpp symbian:contains(QT_CONFIG, s60) { - LIBS += -lCommonDialogs + LIBS += -lcommondialogs SOURCES += dialogs/qfiledialog_symbian.cpp \ dialogs/qcolordialog_symbian.cpp } diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index b22a908..c595ee8 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -172,11 +172,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) { symbian { SOURCES += styles/qs60style_s60.cpp LIBS += -legul -lbmpanim - contains(CONFIG, is_using_gnupoc) { - LIBS += -laknicon -laknskins -laknskinsrv -lfontutils - } else { - LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils - } + LIBS += -laknicon -laknskins -laknskinsrv -lfontutils } else { SOURCES += styles/qs60style_simulated.cpp RESOURCES += styles/qstyle_s60_simulated.qrc |