Index: trunk/BNC/qwt/qwt.pro
===================================================================
--- trunk/BNC/qwt/qwt.pro	(revision 4271)
+++ trunk/BNC/qwt/qwt.pro	(revision 4274)
@@ -5,4 +5,7 @@
 
 DEFINES += QWT_NO_SVG
+
+OBJECTS_DIR = .obj
+MOC_DIR     = .moc
 
 HEADERS += \
@@ -36,5 +39,37 @@
     qwt_text_engine.h \
     qwt_text_label.h \
-    qwt_text.h
+    qwt_text.h \
+    qwt_curve_fitter.h \
+    qwt_event_pattern.h \
+    qwt_legend.h \
+    qwt_legend_item.h \
+    qwt_legend_itemmanager.h \
+    qwt_plot.h \
+    qwt_plot_renderer.h \
+    qwt_plot_curve.h \
+    qwt_plot_dict.h \
+    qwt_plot_directpainter.h \
+    qwt_plot_grid.h \
+    qwt_plot_histogram.h \
+    qwt_plot_item.h \
+    qwt_plot_intervalcurve.h \
+    qwt_plot_layout.h \
+    qwt_plot_marker.h \
+    qwt_plot_rasteritem.h \
+    qwt_plot_spectrogram.h \
+    qwt_plot_spectrocurve.h \
+    qwt_plot_scaleitem.h \
+    qwt_plot_seriesitem.h \
+    qwt_plot_canvas.h \
+    qwt_plot_panner.h \
+    qwt_plot_picker.h \
+    qwt_plot_zoomer.h \
+    qwt_plot_magnifier.h \
+    qwt_plot_rescaler.h \
+    qwt_raster_data.h \
+    qwt_matrix_raster_data.h \
+    qwt_sampling_thread.h \
+    qwt_series_data.h \
+    qwt_scale_widget.h 
 
 SOURCES += \
@@ -66,74 +101,35 @@
     qwt_scale_engine.cpp \
     qwt_symbol.cpp \
-    qwt_system_clock.cpp
-
- 
-    HEADERS += \
-        qwt_curve_fitter.h \
-        qwt_event_pattern.h \
-        qwt_legend.h \
-        qwt_legend_item.h \
-        qwt_legend_itemmanager.h \
-        qwt_plot.h \
-        qwt_plot_renderer.h \
-        qwt_plot_curve.h \
-        qwt_plot_dict.h \
-        qwt_plot_directpainter.h \
-        qwt_plot_grid.h \
-        qwt_plot_histogram.h \
-        qwt_plot_item.h \
-        qwt_plot_intervalcurve.h \
-        qwt_plot_layout.h \
-        qwt_plot_marker.h \
-        qwt_plot_rasteritem.h \
-        qwt_plot_spectrogram.h \
-        qwt_plot_spectrocurve.h \
-        qwt_plot_scaleitem.h \
-        qwt_plot_seriesitem.h \
-        qwt_plot_canvas.h \
-        qwt_plot_panner.h \
-        qwt_plot_picker.h \
-        qwt_plot_zoomer.h \
-        qwt_plot_magnifier.h \
-        qwt_plot_rescaler.h \
-        qwt_raster_data.h \
-        qwt_matrix_raster_data.h \
-        qwt_sampling_thread.h \
-        qwt_series_data.h \
-        qwt_scale_widget.h 
-
-    SOURCES += \
-        qwt_curve_fitter.cpp \
-        qwt_legend.cpp \
-        qwt_legend_item.cpp \
-        qwt_plot.cpp \
-        qwt_plot_renderer.cpp \
-        qwt_plot_xml.cpp \
-        qwt_plot_axis.cpp \
-        qwt_plot_curve.cpp \
-        qwt_plot_dict.cpp \
-        qwt_plot_directpainter.cpp \
-        qwt_plot_grid.cpp \
-        qwt_plot_histogram.cpp \
-        qwt_plot_item.cpp \
-        qwt_plot_intervalcurve.cpp \
-        qwt_plot_spectrogram.cpp \
-        qwt_plot_spectrocurve.cpp \
-        qwt_plot_scaleitem.cpp \
-        qwt_plot_seriesitem.cpp \
-        qwt_plot_marker.cpp \
-        qwt_plot_layout.cpp \
-        qwt_plot_canvas.cpp \
-        qwt_plot_panner.cpp \
-        qwt_plot_rasteritem.cpp \
-        qwt_plot_picker.cpp \
-        qwt_plot_zoomer.cpp \
-        qwt_plot_magnifier.cpp \
-        qwt_plot_rescaler.cpp \
-        qwt_raster_data.cpp \
-        qwt_matrix_raster_data.cpp \
-        qwt_sampling_thread.cpp \
-        qwt_series_data.cpp \
-        qwt_scale_widget.cpp 
-
-
+    qwt_system_clock.cpp \
+    qwt_curve_fitter.cpp \
+    qwt_legend.cpp \
+    qwt_legend_item.cpp \
+    qwt_plot.cpp \
+    qwt_plot_renderer.cpp \
+    qwt_plot_xml.cpp \
+    qwt_plot_axis.cpp \
+    qwt_plot_curve.cpp \
+    qwt_plot_dict.cpp \
+    qwt_plot_directpainter.cpp \
+    qwt_plot_grid.cpp \
+    qwt_plot_histogram.cpp \
+    qwt_plot_item.cpp \
+    qwt_plot_intervalcurve.cpp \
+    qwt_plot_spectrogram.cpp \
+    qwt_plot_spectrocurve.cpp \
+    qwt_plot_scaleitem.cpp \
+    qwt_plot_seriesitem.cpp \
+    qwt_plot_marker.cpp \
+    qwt_plot_layout.cpp \
+    qwt_plot_canvas.cpp \
+    qwt_plot_panner.cpp \
+    qwt_plot_rasteritem.cpp \
+    qwt_plot_picker.cpp \
+    qwt_plot_zoomer.cpp \
+    qwt_plot_magnifier.cpp \
+    qwt_plot_rescaler.cpp \
+    qwt_raster_data.cpp \
+    qwt_matrix_raster_data.cpp \
+    qwt_sampling_thread.cpp \
+    qwt_series_data.cpp \
+    qwt_scale_widget.cpp