diff options
| author | axis <qt-info@nokia.com> | 2010-07-30 07:10:47 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-30 09:35:56 (GMT) |
| commit | f937d985e9599c16e72b504c404bc8232787c98e (patch) | |
| tree | bcfbb9519ef471da16cf9ec1345c34aa284a6cfc /src/plugins/bearer/symbian | |
| parent | 7e8073b37a8a3e58d82b71934f085ec8143935eb (diff) | |
| download | Qt-f937d985e9599c16e72b504c404bc8232787c98e.zip Qt-f937d985e9599c16e72b504c404bc8232787c98e.tar.gz Qt-f937d985e9599c16e72b504c404bc8232787c98e.tar.bz2 | |
Fixed additional case differences between Gnupoc and Symbian^3.
RevBy: Trust me
Diffstat (limited to 'src/plugins/bearer/symbian')
| -rw-r--r-- | src/plugins/bearer/symbian/3_1/3_1.pro | 6 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pri | 10 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian_3/symbian_3.pro | 6 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbianengine.cpp | 6 |
4 files changed, 21 insertions, 7 deletions
diff --git a/src/plugins/bearer/symbian/3_1/3_1.pro b/src/plugins/bearer/symbian/3_1/3_1.pro index 2d721a8..b7c6aef 100644 --- a/src/plugins/bearer/symbian/3_1/3_1.pro +++ b/src/plugins/bearer/symbian/3_1/3_1.pro @@ -1,5 +1,9 @@ include(../symbian.pri) -LIBS += -lapengine +is_using_gnupoc { + LIBS += -lapengine +} else { + LIBS += -lAPEngine +} TARGET = $${TARGET}_3_1 TARGET.UID3 = 0x2002131C 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 diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro index ff0f11c..fd66198 100644 --- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro +++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro @@ -12,7 +12,11 @@ symbian { } } else { # Fall back to 3_1 implementation on platforms that do not have cmmanager - LIBS += -lapengine + is_using_gnupoc { + LIBS += -lapengine + } else { + LIBS += -lAPEngine + } } } diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp index 4bd6d2f..a7e2936 100644 --- a/src/plugins/bearer/symbian/symbianengine.cpp +++ b/src/plugins/bearer/symbian/symbianengine.cpp @@ -63,9 +63,9 @@ #include <cmpluginpacketdatadef.h> #include <cmplugindialcommondefs.h> #else - #include <apaccesspointitem.h> - #include <apdatahandler.h> - #include <aputils.h> + #include <ApAccessPointItem.h> + #include <ApDataHandler.h> + #include <ApUtils.h> #endif #ifndef QT_NO_BEARERMANAGEMENT |