diff options
| author | axis <qt-info@nokia.com> | 2010-03-16 11:53:21 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-16 12:01:48 (GMT) |
| commit | 30688ce70b4bc161b45826063a242d58a6f06126 (patch) | |
| tree | 9c55713826bbe5b62583f7ebf20c0cec6c008db5 /src | |
| parent | 6682c96867037cfc9f8dc789bcb23decc324a200 (diff) | |
| download | Qt-30688ce70b4bc161b45826063a242d58a6f06126.zip Qt-30688ce70b4bc161b45826063a242d58a6f06126.tar.gz Qt-30688ce70b4bc161b45826063a242d58a6f06126.tar.bz2 | |
Worked around case differences in Symbian^3 and Gnupoc.
RevBy: Miikka Heikkinen
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/util.pri | 9 | ||||
| -rw-r--r-- | src/plugins/s60/3_2/3_2.pro | 7 | ||||
| -rw-r--r-- | src/plugins/s60/5_0/5_0.pro | 7 |
3 files changed, 20 insertions, 3 deletions
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri index 3074367..bd2af85 100644 --- a/src/gui/util/util.pri +++ b/src/gui/util/util.pri @@ -41,5 +41,12 @@ embedded { symbian { LIBS += -lsendas2 -letext -lapmime - contains(QT_CONFIG, s60): LIBS += -lplatformenv -lCommonUI + contains(QT_CONFIG, s60) { + LIBS += -lplatformenv + contains(CONFIG, is_using_gnupoc) { + LIBS += -lcommonui + } else { + LIBS += -lCommonUI + } + } } diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro index 468197d..7700677 100644 --- a/src/plugins/s60/3_2/3_2.pro +++ b/src/plugins/s60/3_2/3_2.pro @@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) { SOURCES += ../src/qlocale_3_2.cpp \ ../src/qdesktopservices_3_2.cpp \ ../src/qcoreapplication_3_2.cpp - LIBS += -lDirectoryLocalizer -lefsrv + contains(CONFIG, is_using_gnupoc) { + LIBS += -ldirectorylocalizer + } else { + LIBS += -lDirectoryLocalizer + } + LIBS += -lefsrv INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro index 86e3dc9..164dfaa 100644 --- a/src/plugins/s60/5_0/5_0.pro +++ b/src/plugins/s60/5_0/5_0.pro @@ -10,7 +10,12 @@ contains(S60_VERSION, 3.1) { SOURCES += ../src/qlocale_3_2.cpp \ ../src/qdesktopservices_3_2.cpp \ ../src/qcoreapplication_3_2.cpp - LIBS += -lDirectoryLocalizer -lefsrv + contains(CONFIG, is_using_gnupoc) { + LIBS += -ldirectorylocalizer + } else { + LIBS += -lDirectoryLocalizer + } + LIBS += -lefsrv INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } |