--- a/javaextensions/bluetooth/bluetoothcommons/build/javabluetoothcommons.pro	Wed Sep 01 12:33:18 2010 +0100
+++ b/javaextensions/bluetooth/bluetoothcommons/build/javabluetoothcommons.pro	Tue Sep 14 21:06:50 2010 +0300
@@ -14,20 +14,33 @@
 # Description: 
 #
 
+include(../../../../inc/build_defines.pri)
+
 TEMPLATE=lib
 TARGET=javabluetoothcommons
 CONFIG += omj java stl
-CONFIG -= qt
 
-symbian {
+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 {	
     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)
 
-include(../../../../build/omj.pri)
+