diff -r 1f5e22508b46 -r b15683f9e989 podcatcher_qt/Makefile
--- a/podcatcher_qt/Makefile	Mon Aug 23 06:14:01 2010 +0200
+++ b/podcatcher_qt/Makefile	Mon Aug 23 21:16:31 2010 +0200
@@ -1,5 +1,5 @@
 # ==============================================================================
-# Generated by qmake (2.01a) (Qt 4.6.3) on: fr 20. aug 17:41:52 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: må 23. aug 21:00:55 2010
 # This file is generated by qmake and should not be modified by the
 # user.
 #  Name        : Makefile
@@ -9,7 +9,7 @@
 
 
 MAKEFILE          = Makefile
-QMAKE             = c:\Qt\4.6.3\bin\qmake.exe
+QMAKE             = c:\NokiaQtSDK\Symbian\SDK\bin\qmake.exe
 DEL_FILE          = del
 DEL_DIR           = rmdir
 MOVE              = move
@@ -28,7 +28,7 @@
 endif
 
 DEFINES	 = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DQT_GUI_LIB -DQT_CORE_LIB
-INCPATH	 =  -I"C:/Qt/4.6.3/include/QtCore" -I"C:/Qt/4.6.3/include/QtCore/tmp" -I"C:/Qt/4.6.3/include/QtGui" -I"C:/Qt/4.6.3/include/QtGui/tmp" -I"C:/Qt/4.6.3/include" -I"C:/Qt/4.6.3/include/tmp" -I"C:/Qt/4.6.3/mkspecs/common/symbian" -I"C:/Qt/4.6.3/mkspecs/common/symbian/tmp" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis/sys" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis/stlportv5" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/mw" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/loc" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw/loc" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/loc/sc" -I"C:/S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw/loc/sc" -I"C:/hg/podcatcher_fcl/podcatcher_qt" -I"C:/hg/podcatcher_fcl/podcatcher_qt/tmp"
+INCPATH	 =  -I"C:/NokiaQtSDK/Symbian/SDK/include/QtCore" -I"C:/NokiaQtSDK/Symbian/SDK/include/QtCore/tmp" -I"C:/NokiaQtSDK/Symbian/SDK/include/QtGui" -I"C:/NokiaQtSDK/Symbian/SDK/include/QtGui/tmp" -I"C:/NokiaQtSDK/Symbian/SDK/include" -I"C:/NokiaQtSDK/Symbian/SDK/include/tmp" -I"C:/NokiaQtSDK/Symbian/SDK/mkspecs/common/symbian" -I"C:/NokiaQtSDK/Symbian/SDK/mkspecs/common/symbian/tmp" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/osextensions/stdapis" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/osextensions/stdapis/sys" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/stdapis" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/stdapis/sys" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/osextensions/stdapis/stlport" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/stdapis/stlport" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/oem" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/middleware" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/middleware" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/osextensions" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/osextensions" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/osextensions/loc" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/middleware/loc" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/osextensions/loc/sc" -I"C:/NokiaQtSDK/Symbian/SDK/epoc32/include/domain/middleware/loc/sc" -I"C:/hg/podcatcher_fcl/podcatcher_qt" -I"C:/hg/podcatcher_fcl/podcatcher_qt/tmp" -I"C:/hg/podcatcher_fcl/podcatcher_qt/inc" -I"C:/hg/podcatcher_fcl/podcatcher_qt/inc/tmp" -I"C:/hg/podcatcher_fcl/podcatcher_qt/src" -I"C:/hg/podcatcher_fcl/podcatcher_qt/src/tmp"
 first: default
 default: debug-winscw
 all: debug release
@@ -83,8 +83,8 @@
 compiler_moc_header_make_all: moc_podcatcherwin.cpp
 compiler_moc_header_clean:
 	-$(DEL_FILE) moc_podcatcherwin.cpp 2> NUL
-moc_podcatcherwin.cpp: podcatcherwin.h
-	C:\Qt\4.6.3\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN podcatcherwin.h -o moc_podcatcherwin.cpp
+moc_podcatcherwin.cpp: inc\podcatcherwin.h
+	C:\NokiaQtSDK\Symbian\SDK\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN inc\podcatcherwin.h -o moc_podcatcherwin.cpp
 
 compiler_rcc_make_all:
 compiler_rcc_clean:
@@ -96,8 +96,8 @@
 compiler_uic_make_all: ui_podcatcherwin.h
 compiler_uic_clean:
 	-$(DEL_FILE) ui_podcatcherwin.h 2> NUL
-ui_podcatcherwin.h: podcatcherwin.ui
-	c:\Qt\4.6.3\bin\uic.exe podcatcherwin.ui -o ui_podcatcherwin.h
+ui_podcatcherwin.h: forms\podcatcherwin.ui
+	c:\NokiaQtSDK\Symbian\SDK\bin\uic.exe forms\podcatcherwin.ui -o ui_podcatcherwin.h
 
 compiler_yacc_decl_make_all:
 compiler_yacc_decl_clean:
@@ -108,18 +108,22 @@
 compiler_clean: compiler_moc_header_clean compiler_uic_clean 
 
 create_temps:
-	-@ if NOT EXIST "C:\Qt\4.6.3\include\QtCore\tmp" mkdir "C:\Qt\4.6.3\include\QtCore\tmp"
-	-@ if NOT EXIST "C:\Qt\4.6.3\include\QtGui\tmp" mkdir "C:\Qt\4.6.3\include\QtGui\tmp"
-	-@ if NOT EXIST "C:\Qt\4.6.3\include\tmp" mkdir "C:\Qt\4.6.3\include\tmp"
-	-@ if NOT EXIST "C:\Qt\4.6.3\mkspecs\common\symbian\tmp" mkdir "C:\Qt\4.6.3\mkspecs\common\symbian\tmp"
+	-@ if NOT EXIST "C:\NokiaQtSDK\Symbian\SDK\include\QtCore\tmp" mkdir "C:\NokiaQtSDK\Symbian\SDK\include\QtCore\tmp"
+	-@ if NOT EXIST "C:\NokiaQtSDK\Symbian\SDK\include\QtGui\tmp" mkdir "C:\NokiaQtSDK\Symbian\SDK\include\QtGui\tmp"
+	-@ if NOT EXIST "C:\NokiaQtSDK\Symbian\SDK\include\tmp" mkdir "C:\NokiaQtSDK\Symbian\SDK\include\tmp"
+	-@ if NOT EXIST "C:\NokiaQtSDK\Symbian\SDK\mkspecs\common\symbian\tmp" mkdir "C:\NokiaQtSDK\Symbian\SDK\mkspecs\common\symbian\tmp"
 	-@ if NOT EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\tmp" mkdir "C:\hg\podcatcher_fcl\podcatcher_qt\tmp"
+	-@ if NOT EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\inc\tmp" mkdir "C:\hg\podcatcher_fcl\podcatcher_qt\inc\tmp"
+	-@ if NOT EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\src\tmp" mkdir "C:\hg\podcatcher_fcl\podcatcher_qt\src\tmp"
 
 extension_clean: compiler_clean
-	-@ if EXIST "C:\Qt\4.6.3\include\QtCore\tmp" rmdir  /S /Q  "C:\Qt\4.6.3\include\QtCore\tmp"
-	-@ if EXIST "C:\Qt\4.6.3\include\QtGui\tmp" rmdir  /S /Q  "C:\Qt\4.6.3\include\QtGui\tmp"
-	-@ if EXIST "C:\Qt\4.6.3\include\tmp" rmdir  /S /Q  "C:\Qt\4.6.3\include\tmp"
-	-@ if EXIST "C:\Qt\4.6.3\mkspecs\common\symbian\tmp" rmdir  /S /Q  "C:\Qt\4.6.3\mkspecs\common\symbian\tmp"
+	-@ if EXIST "C:\NokiaQtSDK\Symbian\SDK\include\QtCore\tmp" rmdir  /S /Q  "C:\NokiaQtSDK\Symbian\SDK\include\QtCore\tmp"
+	-@ if EXIST "C:\NokiaQtSDK\Symbian\SDK\include\QtGui\tmp" rmdir  /S /Q  "C:\NokiaQtSDK\Symbian\SDK\include\QtGui\tmp"
+	-@ if EXIST "C:\NokiaQtSDK\Symbian\SDK\include\tmp" rmdir  /S /Q  "C:\NokiaQtSDK\Symbian\SDK\include\tmp"
+	-@ if EXIST "C:\NokiaQtSDK\Symbian\SDK\mkspecs\common\symbian\tmp" rmdir  /S /Q  "C:\NokiaQtSDK\Symbian\SDK\mkspecs\common\symbian\tmp"
 	-@ if EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\tmp" rmdir  /S /Q  "C:\hg\podcatcher_fcl\podcatcher_qt\tmp"
+	-@ if EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\inc\tmp" rmdir  /S /Q  "C:\hg\podcatcher_fcl\podcatcher_qt\inc\tmp"
+	-@ if EXIST "C:\hg\podcatcher_fcl\podcatcher_qt\src\tmp" rmdir  /S /Q  "C:\hg\podcatcher_fcl\podcatcher_qt\src\tmp"
 
 pre_targetdeps: \
 	generated_sources \
@@ -130,7 +134,6 @@
 	moc_podcatcherwin.cpp
 
 all_source_deps: \
-	podcatcherwin.h \
 	ui_podcatcherwin.h
 
 finalize:
@@ -230,7 +233,7 @@
 	$(ABLD) reallyclean armv6 urel
 
 run:
-	-call /S605th/symbian3/Nokia_Symbian3_SDK_v0.8/epoc32/release/winscw/udeb/podcatcher_qt.exe $(QT_RUN_OPTIONS)
+	-call /NokiaQtSDK/Symbian/SDK/epoc32/release/winscw/udeb/podcatcher_qt.exe $(QT_RUN_OPTIONS)
 runonphone: sis
 	runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis podcatcher_qt.sis podcatcher_qt.exe $(QT_RUN_OPTIONS)