From 95741a1c3380041190c5d552273b8f23ff474218 Mon Sep 17 00:00:00 2001
From: bergamaschi <bergamaschi@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Thu, 22 Nov 2012 10:11:54 +0000
Subject: [PATCH] project file finally ok

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@116 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/Makefile           |  4 ++--
 slsDetectorGui/slsDetectorGui.pro | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile
index f75ed7941..e27b31dde 100644
--- a/slsDetectorGui/Makefile
+++ b/slsDetectorGui/Makefile
@@ -1,6 +1,6 @@
 
 PROG= $(DESTDIR)/slsDetectorGui
-DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/* forms/include/*)
+#DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/ forms/*)
 DESTDIR?=bin
 DOCDIR?=docs
 LIBDIR?=../slsDetectorSoftware
@@ -17,7 +17,7 @@ clean:
 Makefile.gui: mm
 
 mm:
-	qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
+	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' 
 
 doc:
 	cd manual && make DESTDIR=$(DOCDIR)
diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro
index f66c3aa54..05d2db34d 100644
--- a/slsDetectorGui/slsDetectorGui.pro
+++ b/slsDetectorGui/slsDetectorGui.pro
@@ -7,7 +7,17 @@ UI_HEADERS_DIR		= 		forms/include
 SLSDETLIB ?=../slsDetectorSoftware               
 RESOURCES   		+=  	icons.qrc
 
-CONFIG				+=		debug 
+CONFIG				+=		debug no_include_pwd
+
+QMAKE_INCDIR_QT = $(QTDIR)/include/
+
+QMAKE_LIBS_QT = 	-L$(QTDIR)/lib 
+QMAKE_LIBS = 	-L$(QTDIR)/lib 
+
+QMAKE_UIC = $(QTDIR)/bin/uic
+
+QMAKE_MOC =  $(QTDIR)/bin/moc
+QMAKE_RCC =  $(QTDIR)/bin/rcc
 
 QMAKE_CXXFLAGS_WARN_ON = 	-w 
 QMAKE_CFLAGS_WARN_ON   = 	-w
@@ -26,16 +36,14 @@ QMAKE_CLEAN 		+= 		docs/*/*
 #LIBS				+=		-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
 #							-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib 
  
-LIBS				+=		-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib  
+LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib  
 
 DEPENDPATH  		+=		\
 							slsDetectorPlotting/include\
 							include\
 							forms/include
 
-
-
-INCLUDEPATH 		+= 		\
+INCLUDEPATH 		= 	\	 
 							$(QWTDIR)/include\
 							$(QWTDIR) \
                               $(QWTDIR)/src\