summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/bluetooth.pro
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2012-02-07 16:59:47 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-08 14:01:13 +0100
commit09defae552883e1d673021772e51fdce81838560 (patch)
tree775409288b3b3178d60556be6d9d9d2b9f49616d /src/bluetooth/bluetooth.pro
parent79095c3fbc97abd0138b91bb1833628f1d09fdad (diff)
No more Bluetooth on Symbian
This change cleans the code base significantly. Change-Id: I668d05d72cf5aa896818139e2daba51909c0b9dd Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
-rw-r--r--src/bluetooth/bluetooth.pro58
1 files changed, 2 insertions, 56 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 8a8521ac..93e82e71 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -60,61 +60,7 @@ SOURCES += \
qbluetoothtransferrequest.cpp \
qbluetoothtransferreply.cpp
-symbian {
- contains(S60_VERSION, 3.1) | contains(S60_VERSION, 3.2) {
- DEFINES += DO_NOT_BUILD_BLUETOOTH_SYMBIAN_BACKEND
- message("S60 3.1 or 3.2 sdk not supported by bluetooth")
- SOURCES += \
- qbluetoothdevicediscoveryagent_p.cpp \
- qbluetoothlocaldevice_p.cpp \
- qbluetoothserviceinfo_p.cpp \
- qbluetoothservicediscoveryagent_p.cpp \
- qbluetoothsocket_p.cpp \
- ql2capserver_p.cpp \
- qrfcommserver_p.cpp \
- qbluetoothtransfermanager_p.cpp
- }
-}
-
-symbian {
- !contains(DEFINES, DO_NOT_BUILD_BLUETOOTH_SYMBIAN_BACKEND) {
- DEFINES += QT_SYMBIAN_BLUETOOTH
- INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
- include(symbian/symbian.pri)
-
- PRIVATE_HEADERS += \
- qbluetoothtransferreply_symbian_p.h \
- qbluetoothlocaldevice_p.h
-
- SOURCES += \
- qbluetoothserviceinfo_symbian.cpp\
- qbluetoothdevicediscoveryagent_symbian.cpp\
- qbluetoothservicediscoveryagent_symbian.cpp\
- qbluetoothsocket_symbian.cpp\
- qrfcommserver_symbian.cpp \
- qbluetoothlocaldevice_symbian.cpp \
- qbluetoothtransfermanager_symbian.cpp \
- qbluetoothtransferreply_symbian.cpp \
- ql2capserver_symbian.cpp
-
- contains(S60_VERSION, 5.0) {
- message("NOTICE - START")
- message("Bluetooth backend needs SDK plugin from Forum Nokia for 5.0 SDK")
- message("NOTICE - END")
- LIBS *= -lirobex
- } else {
- LIBS *= -lobex
- }
- LIBS *= -lesock \
- -lbluetooth \
- -lsdpagent \
- -lsdpdatabase \
- -lestlib \
- -lbtengsettings \
- -lbtmanclient \
- -lbtdevice
- }
-} else:contains(config_test_bluez, yes):contains(QT_CONFIG, dbus) {
+contains(config_test_bluez, yes):contains(QT_CONFIG, dbus) {
QT *= dbus
DEFINES += QT_BLUEZ_BLUETOOTH
@@ -143,7 +89,7 @@ symbian {
} else {
message("Unsupported bluetooth platform, will not build a working QBluetooth library")
- message("Either no Qt dBus found, no bluez headers, or not symbian")
+ message("Either no Qt dBus found or no Bluez headers")
SOURCES += \
qbluetoothdevicediscoveryagent_p.cpp \
qbluetoothlocaldevice_p.cpp \