diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 09:58:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 09:58:10 (GMT) |
| commit | dfb56c408b2561c194922f36a0d08c2dc7c43f9b (patch) | |
| tree | ea31b1e33e91d4172b41ed5bffbde5af0490686a /src/plugins/bearer/symbian/symbian.pri | |
| parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
| parent | 1f816c18df27cf3b39f94759ceccdaa3514e4e8d (diff) | |
| download | Qt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.zip Qt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.tar.gz Qt-dfb56c408b2561c194922f36a0d08c2dc7c43f9b.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:
Fixed incorrect values for QSysInfo::symbianVersion().
Switched from using hardlinks to copies in Symbian building.
Added SYMBIAN_VERSION variable to qmake.
Moved the S60 version detection to the common symbian profile.
Fixed circular dependency warning.
Fixed rvct.h header inclusion on Symbian^3.
Included libstdcppv5 support for the makefile build system.
Prevented makefile build system from using platform provided paths.
Fixed additional case differences between Gnupoc and Symbian^3.
Diffstat (limited to 'src/plugins/bearer/symbian/symbian.pri')
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pri | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index afe84dc..9b3f50c 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/src/plugins/bearer/symbian/symbian.pri @@ -14,8 +14,6 @@ INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private LIBS += -lcommdb \ - -lapsettingshandlerui \ - -lconnmon \ -lcentralrepository \ -lesock \ -linsock \ @@ -23,6 +21,14 @@ LIBS += -lcommdb \ -lefsrv \ -lnetmeta +is_using_gnupoc { + LIBS += -lconnmon \ + -lapsettingshandlerui +} else { + LIBS += -lConnMon \ + -lApSettingsHandlerUI +} + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target |