--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/radio.pri	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/radio.pri	Wed Jun 23 19:08:38 2010 +0300
@@ -1,35 +1,24 @@
 INCLUDEPATH += $$PWD
 
-exists($${EPOCROOT}epoc32\release\armv5\lib\tunerutility.lib) {
-	CONFIG += TUNERLIB
+contains(tunerlib_s60_enabled, yes) {
+
 	LIBS += -ltunerutility
 	DEFINES += TUNERLIBUSED
-	INCLUDEPATH += $${EPOCROOT}epoc32\include\mmf\common	
-}
+	INCLUDEPATH += $${EPOCROOT}epoc32\include\mmf\common
 
-exists($${EPOCROOT}epoc32\release\armv5\lib\Radio_Utility.lib) {
-   	CONFIG += RADIOUTILITYLIB
-	LIBS += -lRadio_Utility
-	DEFINES += RADIOUTILITYLIBUSED
-}
-contains(QT_CONFIG, TUNERLIB) && !contains(QT_CONFIG, RADIOUTILITYLIB) {
-	warning("Radio isn't compiled in due to missing libraries. (3.1 tuner and since 3.2 radio utility libraries)")
+	HEADERS += $$PWD/s60radiotunercontrol_31.h
+    SOURCES += $$PWD/s60radiotunercontrol_31.cpp
 }
 
-TUNERLIB {
-HEADERS += \
-    $$PWD/s60radiotunerservice.h \
-    $$PWD/s60radiotunercontrol_31.h
-SOURCES += \
-    $$PWD/s60radiotunerservice.cpp \
-    $$PWD/s60radiotunercontrol_31.cpp
+contains(radioutility_s60_enabled, yes) {
+	LIBS += -lRadio_Utility
+	DEFINES += RADIOUTILITYLIBUSED
+
+    HEADERS += $$PWD/s60radiotunercontrol_since32.h
+    SOURCES += $$PWD/s60radiotunercontrol_since32.cpp
 }
 
-RADIOUTILITYLIB {
-HEADERS += \
-    $$PWD/s60radiotunerservice.h \
-    $$PWD/s60radiotunercontrol_since32.h
-SOURCES += \
-    $$PWD/s60radiotunerservice.cpp \
-    $$PWD/s60radiotunercontrol_since32.cpp
+contains(tunerlib_s60_enabled, yes)|contains(radioutility_s60_enabled, yes) {
+    HEADERS += $$PWD/s60radiotunerservice.h
+    SOURCES += $$PWD/s60radiotunerservice.cpp
 }
\ No newline at end of file