diff -r 63aabac4416d -r f54ebcfc1b80 radioapp/radioapplication/radioapplication.pro
--- a/radioapp/radioapplication/radioapplication.pro	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radioapplication/radioapplication.pro	Mon May 03 12:31:41 2010 +0300
@@ -19,50 +19,48 @@
 TEMPLATE        = app
 TARGET          = qtfmradio
 TRANSLATIONS    += fmradio.ts 
-win32:DESTDIR   = ../bin
 
 symbian: {
-    DEFINES += SYMBIAN
-    TARGET.CAPABILITY = CAP_APPLICATION MultimediaDD
-    TARGET.VID = VID_DEFAULT
-    TARGET.UID3 = 0x101FF976 # Old visual radio uid
-    TARGET.EPOCSTACKSIZE = 0x14000
-    TARGET.EPOCHEAPSIZE = 0x020000 0x2400000
+    TARGET.CAPABILITY       = CAP_APPLICATION MultimediaDD
+    TARGET.VID              = VID_DEFAULT
+    TARGET.UID3             = 0x101FF976 # Old visual radio uid
+    TARGET.EPOCSTACKSIZE    = 0x14000
+    TARGET.EPOCHEAPSIZE     = 0x020000 0x2400000
 }
 
-QT          = core
 CONFIG      += hb service
-CONFIG      -= gui network svg
 
 # Service provider specific configuration.
 SERVICE.FILE = resources/service_conf.xml
-#SERVICE.OPTIONS = embeddable
 
 INCLUDEPATH += . inc
-INCLUDEPATH += ../radioenginewrapper/commoninc
+INCLUDEPATH += ../commoninc
 INCLUDEPATH += ../radiouiengine/inc
 INCLUDEPATH += ../radiowidgets/inc
 
-win32:INCLUDEPATH += ../radioenginewrapper/inc
-win32:LIBS += -L../bin
-
-LIBS += -lradiouiengine
-LIBS += -lradiowidgets
+LIBS        += -lradiouiengine
+LIBS        += -lradiowidgets
 
 # UI does not normally depend on the wrapper, but it does on two special cases
 # 1. Logging is enabled. The logger is in the wrapper module
-# 2. Radio is built for win32 target. The test window needs to access wrapper
+# 2. Radio is built for win32 target. The test window needs to access the wrapper
 LOGGING_ENABLED:LIBS += -lradioenginewrapper
-win32:LIBS += -lradioenginewrapper
-
-DEPENDPATH  += $$INCLUDEPATH src
 
 # Sources
-HEADERS += radioapplication.h
+HEADERS     += radioapplication.h
 
-win32:HEADERS += testwindow_win32.h
+SOURCES     += main.cpp
+SOURCES     += radioapplication.cpp
+
+# Win32 specific stuff
+win32: {
+    LIBS += -lradioenginewrapper
 
-SOURCES += main.cpp
-SOURCES += radioapplication.cpp
+    HEADERS += testwindow_win32.h
+
+    SOURCES += testwindow_win32.cpp
 
-win32:SOURCES += testwindow_win32.cpp
+    DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\"
+}
+
+DEPENDPATH  += $$INCLUDEPATH src