--- a/radioapp/radiowidgets/radiowidgets.pro	Fri Apr 16 14:58:55 2010 +0300
+++ b/radioapp/radiowidgets/radiowidgets.pro	Mon May 03 12:31:41 2010 +0300
@@ -18,73 +18,51 @@
 
 TEMPLATE    = lib
 TARGET      = radiowidgets
-CONFIG      += dll
+CONFIG      += dll hb
 DEFINES     += BUILD_WIDGETS_DLL
-win32:DESTDIR = ../bin
-
-# Wrapper does not depend on QtGui or Orbit
-QT          = core gui
-CONFIG      += hb
-
-symbian: {
-    DEFINES += SYMBIAN
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = CAP_GENERAL_DLL
-}
 
 INCLUDEPATH += inc
 INCLUDEPATH += ../radiouiengine/inc
-INCLUDEPATH += ../radioenginewrapper/commoninc
+INCLUDEPATH += ../commoninc
 
-win32:LIBS += -L../bin
-
-LIBS += -lradiouiengine
+LIBS        += -lradiouiengine
 
 LOGGING_ENABLED:LIBS += -lradioenginewrapper
 
-DEPENDPATH += $$INCLUDEPATH src
-
-# $$_PRO_FILE_PWD_ points to the directory of the pro file
-MOC_DIR = $$_PRO_FILE_PWD_/tmp
+DEPENDPATH  += $$INCLUDEPATH src
 
 # Input
-HEADERS += radiowidgetsexport.h
-HEADERS += radiomainwindow.h
-HEADERS += radiouiutilities.h
-HEADERS += radioviewbase.h
-HEADERS += radioxmluiloader.h
-HEADERS += radiotuningview.h
-HEADERS += radiostripbase.h
-HEADERS += radiofrequencystrip.h
-HEADERS += radiofrequencyitem.h
-HEADERS += radiostationsview.h
-HEADERS += radiobannerlabel.h
-HEADERS += radiowizardview.h
-HEADERS += radiofrequencyscanner.h
-HEADERS += radiocontextmenu.h
-HEADERS += radiofadinglabel.h
-HEADERS += radiostationcarousel.h
-HEADERS += radiostationitem.h
-HEADERS += radiostationcontrolwidget.h
-HEADERS += radioplaylogview.h
+HEADERS     += radiowidgetsexport.h
+HEADERS     += radiomainwindow.h
+HEADERS     += radiouiutilities.h
+HEADERS     += radioviewbase.h
+HEADERS     += radioxmluiloader.h
+HEADERS     += radiotuningview.h
+HEADERS     += radiostripbase.h
+HEADERS     += radiofrequencystrip.h
+HEADERS     += radiofrequencyitem.h
+HEADERS     += radiostationsview.h
+HEADERS     += radiobannerlabel.h
+HEADERS     += radiofrequencyscanner.h
+HEADERS     += radiofadinglabel.h
+HEADERS     += radiostationcarousel.h
+HEADERS     += radiostationitem.h
+HEADERS     += radiohistoryview.h
 
-SOURCES += radiomainwindow.cpp
-SOURCES += radiouiutilities.cpp
-SOURCES += radioviewbase.cpp
-SOURCES += radioxmluiloader.cpp
-SOURCES += radiotuningview.cpp
-SOURCES += radiostripbase.cpp
-SOURCES += radiofrequencystrip.cpp
-SOURCES += radiofrequencyitem.cpp
-SOURCES += radiostationsview.cpp
-SOURCES += radiobannerlabel.cpp
-SOURCES += radiowizardview.cpp
-SOURCES += radiofrequencyscanner.cpp
-SOURCES += radiocontextmenu.cpp
-SOURCES += radiofadinglabel.cpp
-SOURCES += radiostationcarousel.cpp
-SOURCES += radiostationitem.cpp
-SOURCES += radiostationcontrolwidget.cpp
-SOURCES += radioplaylogview.cpp
+SOURCES     += radiomainwindow.cpp
+SOURCES     += radiouiutilities.cpp
+SOURCES     += radioviewbase.cpp
+SOURCES     += radioxmluiloader.cpp
+SOURCES     += radiotuningview.cpp
+SOURCES     += radiostripbase.cpp
+SOURCES     += radiofrequencystrip.cpp
+SOURCES     += radiofrequencyitem.cpp
+SOURCES     += radiostationsview.cpp
+SOURCES     += radiobannerlabel.cpp
+SOURCES     += radiofrequencyscanner.cpp
+SOURCES     += radiofadinglabel.cpp
+SOURCES     += radiostationcarousel.cpp
+SOURCES     += radiostationitem.cpp
+SOURCES     += radiohistoryview.cpp
 
-RESOURCES += res/fmradioui.qrc
+RESOURCES   += res/fmradioui.qrc