--- qsampler/trunk/qsampler.pro.in	2006/12/03 18:26:13	961
+++ qsampler/trunk/qsampler.pro.in	2007/11/21 11:46:40	1504
@@ -1,62 +1,50 @@
-INCLUDEPATH += ./src
+INCPATH  += ./src
 
-HEADERS  += src/qsamplerAbout.h \
+HEADERS   = src/qsamplerAbout.h \
 			src/qsamplerOptions.h \
 			src/qsamplerChannel.h \
 			src/qsamplerMessages.h \
 			src/qsamplerInstrument.h \
 			src/qsamplerInstrumentList.h \
-			src/qsamplerDevice.h
+			src/qsamplerDevice.h \
+			src/qsamplerUtilities.h \
+			src/qsamplerInstrumentForm.h \
+			src/qsamplerInstrumentListForm.h \
+			src/qsamplerDeviceForm.h \
+			src/qsamplerChannelStrip.h \
+			src/qsamplerChannelForm.h \
+			src/qsamplerOptionsForm.h \
+			src/qsamplerMainForm.h
 
-SOURCES  += src/main.cpp \
+SOURCES   = src/main.cpp \
 			src/qsamplerOptions.cpp \
 			src/qsamplerChannel.cpp \
 			src/qsamplerMessages.cpp \
 			src/qsamplerInstrument.cpp \
 			src/qsamplerInstrumentList.cpp \
-			src/qsamplerDevice.cpp
+			src/qsamplerDevice.cpp \
+			src/qsamplerUtilities.cpp \
+			src/qsamplerInstrumentForm.cpp \
+			src/qsamplerInstrumentListForm.cpp \
+			src/qsamplerDeviceForm.cpp \
+			src/qsamplerChannelStrip.cpp \
+			src/qsamplerChannelForm.cpp \
+			src/qsamplerOptionsForm.cpp \
+			src/qsamplerMainForm.cpp
 
-FORMS     = src/qsamplerMainForm.ui \
+FORMS     = src/qsamplerInstrumentForm.ui \
+			src/qsamplerInstrumentListForm.ui \
+			src/qsamplerDeviceForm.ui \
 			src/qsamplerChannelStrip.ui \
 			src/qsamplerChannelForm.ui \
 			src/qsamplerOptionsForm.ui \
-			src/qsamplerInstrumentForm.ui \
-			src/qsamplerInstrumentListForm.ui \
-			src/qsamplerDeviceForm.ui
+			src/qsamplerMainForm.ui
 
-IMAGES    = icons/qsampler.png \
-			icons/qsamplerChannel.png \
-			icons/qsamplerInstrument.png \
-			icons/qsamplerDevice.png \
-			icons/fileNew.png \
-			icons/fileOpen.png \
-			icons/fileSave.png \
-			icons/fileRestart.png \
-			icons/fileReset.png \
-			icons/editAddChannel.png \
-			icons/editRemoveChannel.png \
-			icons/editSetupChannel.png \
-			icons/editResetChannel.png \
-			icons/editResetAllChannels.png \
-			icons/channelsArrange.png \
-			icons/itemGroup.png \
-			icons/itemGroupOpen.png \
-			icons/itemFile.png \
-			icons/formAccept.png \
-			icons/formReject.png \
-			icons/formRefresh.png \
-			icons/deviceCreate.png \
-			icons/deviceDelete.png \
-			icons/displaybg1.png \
-			icons/midi1.png \
-			icons/midi2.png \
-			icons/audio1.png \
-			icons/audio2.png
+RESOURCES = icons/qsampler.qrc
 
 TEMPLATE  = app
-CONFIG   += qt @ac_thread@ warn_on @ac_debug@
+CONFIG   += qt thread warn_on @ac_debug@
 LANGUAGE  = C++
 
 LIBS     += @ac_libs@
 INCPATH  += @ac_incpath@
-