diff -r ae942d28ec0e -r 2455ef1f5bbc javaextensions/bluetooth/bluetoothcommons/build/javabluetoothcommons.pro --- a/javaextensions/bluetooth/bluetoothcommons/build/javabluetoothcommons.pro Tue Aug 31 15:09:22 2010 +0300 +++ b/javaextensions/bluetooth/bluetoothcommons/build/javabluetoothcommons.pro Wed Sep 01 12:33:18 2010 +0100 @@ -14,33 +14,20 @@ # Description: # -include(../../../../inc/build_defines.pri) - TEMPLATE=lib TARGET=javabluetoothcommons CONFIG += omj java stl +CONFIG -= qt -contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_5_0) { - CONFIG -= qt -} -contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_9_2) { - CONFIG -= qt -} -contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) { - CONFIG += hb -} - - -symbian { +symbian { SOURCES += ../src/*.cpp SOURCES += ../src.s60/*.cpp SOURCES += ../bluetoothplatformcontrol/src/*.cpp - SOURCES += ../bluetoothplatformcontrol/src.s60/*.cpp + SOURCES += ../bluetoothplatformcontrol/src.s60/*.cpp } LIBS += -lsdpdatabase -lbtengsettings -lbluetooth -lbtmanclient \ -lbtdevice -ljavacomms -ljavafileutils -lesock + include(../../../../build/omj.pri) - -