diff -p -up lastfm-1.5.4/src/httpinput/httpinput.h.0015~ lastfm-1.5.4/src/httpinput/httpinput.h
--- lastfm-1.5.4/src/httpinput/httpinput.h.0015~	2010-11-02 18:24:21.000000000 +0100
+++ lastfm-1.5.4/src/httpinput/httpinput.h	2010-11-03 09:24:34.000000000 +0100
@@ -97,9 +97,9 @@ public slots:
     virtual void load( const QString& url );
 
 signals:
-    virtual void stateChanged( RadioState newState );
+    void stateChanged( RadioState newState );
 
-    virtual void error( int errorCode, const QString& reason );
+    void error( int errorCode, const QString& reason );
 
     /*********************************************************************/ /**
         Emitted if the stream has to rebuffer. Buffering finishes when
@@ -108,7 +108,7 @@ signals:
         @param size - current buffer size
         @param total - total buffer size
     **************************************************************************/
-    virtual void
+    void
     buffering( int size, int total );
 
 private:
diff -p -up lastfm-1.5.4/src/libFingerprint/libFingerprint.pro.0015~ lastfm-1.5.4/src/libFingerprint/libFingerprint.pro
--- lastfm-1.5.4/src/libFingerprint/libFingerprint.pro.0015~	2010-11-03 09:24:34.000000000 +0100
+++ lastfm-1.5.4/src/libFingerprint/libFingerprint.pro	2010-11-03 09:24:34.000000000 +0100
@@ -39,13 +39,13 @@ unix:mac {
 }
 
 unix:!mac {
-    LIBPATH += $$BUILD_DIR/../fplib
+    QMAKE_LIBDIR += $$BUILD_DIR/../fplib
     LIBS += $$ROOT_DIR/build/fplib/libfplib$${EXT}.a -lsamplerate -lfftw3f -lmad
 }
 
 win32 {
     # Really not sure about the sanity of this...
-    LIBPATH += $$BUILD_DIR/../fplib $$ROOT_DIR/res/libsamplerate $$ROOT_DIR/res/mad
+    QMAKE_LIBDIR += $$BUILD_DIR/../fplib $$ROOT_DIR/res/libsamplerate $$ROOT_DIR/res/mad
     LIBS += -lfplib$$EXT -llibfftw3f-3 -lmad
     LIBS += -llibsamplerate
 
diff -p -up lastfm-1.5.4/src/libUnicorn/unicorn.pro.inc.0015~ lastfm-1.5.4/src/libUnicorn/unicorn.pro.inc
--- lastfm-1.5.4/src/libUnicorn/unicorn.pro.inc.0015~	2010-11-02 18:24:21.000000000 +0100
+++ lastfm-1.5.4/src/libUnicorn/unicorn.pro.inc	2010-11-03 09:24:34.000000000 +0100
@@ -4,7 +4,7 @@ BUILD_DIR = $$ROOT_DIR/build/$$TARGET
 
 UI_DIR = $$ROOT_DIR/build
 
-LIBPATH += $$BIN_DIR
+QMAKE_LIBDIR += $$BIN_DIR
 INCLUDEPATH += $$ROOT_DIR/src $$UI_DIR
 
 CONFIG( breakpad ) {
diff -p -up lastfm-1.5.4/src/output/alsa-playback/alsaplayback.h.0015~ lastfm-1.5.4/src/output/alsa-playback/alsaplayback.h
--- lastfm-1.5.4/src/output/alsa-playback/alsaplayback.h.0015~	2010-11-02 18:24:21.000000000 +0100
+++ lastfm-1.5.4/src/output/alsa-playback/alsaplayback.h	2010-11-03 09:24:34.000000000 +0100
@@ -57,7 +57,7 @@ class AlsaPlayback : public OutputInterf
         virtual void setVolume( int volume );
 
     signals:
-        virtual void error( int error, const QString& reason );
+        void error( int error, const QString& reason );
 
     public:
         AlsaPlayback();
diff -p -up lastfm-1.5.4/src/ProxyOutput.h.0015~ lastfm-1.5.4/src/ProxyOutput.h
--- lastfm-1.5.4/src/ProxyOutput.h.0015~	2010-11-02 18:24:21.000000000 +0100
+++ lastfm-1.5.4/src/ProxyOutput.h	2010-11-03 09:24:34.000000000 +0100
@@ -51,7 +51,7 @@ class ProxyOutput : public QObject
         virtual void stopPlayback();
 
     signals:
-        virtual void error( int error, const QString& reason );
+        void error( int error, const QString& reason );
 
     private slots:
         void onClientConnected();
diff -p -up lastfm-1.5.4/src/src.pro.0015~ lastfm-1.5.4/src/src.pro
--- lastfm-1.5.4/src/src.pro.0015~	2010-11-03 09:24:34.000000000 +0100
+++ lastfm-1.5.4/src/src.pro	2010-11-03 09:25:53.000000000 +0100
@@ -238,7 +238,7 @@ mac {
 
     SOURCES -= SideBarTreeStyle.cpp
 
-    LIBPATH += $$ROOT_DIR/res/mad
+    QMAKE_LIBDIR += $$ROOT_DIR/res/mad
 
     LIBS += -lmad -framework CoreFoundation -framework Carbon -lz
 }
diff -p -up lastfm-1.5.4/src/transcode/mad/mad.pro.0015~ lastfm-1.5.4/src/transcode/mad/mad.pro
--- lastfm-1.5.4/src/transcode/mad/mad.pro.0015~	2010-11-03 09:24:34.000000000 +0100
+++ lastfm-1.5.4/src/transcode/mad/mad.pro	2010-11-03 09:24:34.000000000 +0100
@@ -10,7 +10,7 @@ win32 {
 }
 
 !linux* {
-    LIBPATH += $$ROOT_DIR/res/mad
+    QMAKE_LIBDIR += $$ROOT_DIR/res/mad
 	INCLUDEPATH += $$ROOT_DIR/res/mad
 }