]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Porting to the SUSE Linux distribution BR_ACHERON_SUSE_porting
authorapo <apo@opencascade.com>
Thu, 10 Apr 2008 09:09:59 +0000 (09:09 +0000)
committerapo <apo@opencascade.com>
Thu, 10 Apr 2008 09:09:59 +0000 (09:09 +0000)
14 files changed:
src/CAF/CAF.pro
src/HTMLService/HTMLService.pro
src/LogWindow/LogWindow.pro
src/OBJECT/OBJECT.pro
src/ObjBrowser/ObjBrowser.pro
src/Plot2d/Plot2d.pro
src/PyConsole/PyConsole.pro
src/STD/STD.pro
src/SUIT/SUIT.pro
src/SVTK/SVTK.pro
src/TableViewer/TableViewer.pro
src/TableViewer/TableViewer_ViewWindow.cxx
src/TableViewer/TableViewer_ViewWindow.h
src/VTKViewer/VTKViewer.pro

index ab8c9c8694967c1bd15e4193ac59a079e079f256..56f51b200aed58fc87588d0c3298d3b51375c3d7 100644 (file)
@@ -4,12 +4,11 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
+CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER} -lQtx -lSUIT -lSTD
@@ -35,8 +34,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index a9ddcc77a5665490fbee5ddb82bcc0ed772b62ed..303e6ab1fee906378154b1670d34c7d8ae227234 100755 (executable)
@@ -4,12 +4,11 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
+CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER}
index b5c0c72e2321ee1b0b940d40f861a7e3ff049c76..aafb19a4ffb3e2a781d3065137a684c7543d64eb 100644 (file)
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index 0b01883af3ec1865b4d317d8b1b2403baaeaf924..5718d74d50391c6df7970902d6f88a7574dd4192 100644 (file)
@@ -4,10 +4,9 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_LDPATH = -L$${CASROOT}/Linux/lib -lTKV3d
+CAS_LDPATH = -L$(CASLIB) -lTKV3d
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += $${CAS_LDPATH}
index 7b95f3b9d5019559d622a526a1f9e14a4b682008..61bf93c5bd9bfdaa6f959008b0da065d8e0fa9aa 100644 (file)
@@ -23,8 +23,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index dbaa3f700fcbea7393e34c9adb34e16d970b77be..9a06a130f1fefc409ef620efef077ec59fa26cdf 100644 (file)
@@ -4,13 +4,9 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-QWTHOME=$$(QWTHOME)
-QWTINC=$${QWTHOME}/includes
-QWTLIB=$${QWTHOME}/lib
-
-INCLUDEPATH += ../../include $${QWTINC} $$(PYTHONINC)
+INCLUDEPATH += ../../include $$(QWTINC) $$(PYTHONINC)
 INCLUDEPATH += ../Qtx ../SUIT
-unix:LIBS  += -L$${QWTLIB} -lqwt
+unix:LIBS  += -L$$(QWTLIB) -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB)
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT
 
@@ -31,8 +27,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index 01a4f69c6e728208ec52b6ae21f47610248b6781..a4fd5061b3a257fb23bf2cb20acdf317ea5b0d6b 100644 (file)
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index 81e5dcbd4ba4831899c6c9104c920a9605f4b056..5d283c7580e3646cc1051243ee3dd1d52a2f3e1c 100644 (file)
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index a70f8567c1f7ce093043a9850059c071c0dfeaab..63f66e07a40a3bc964eabcdae6f0644eeb131428 100644 (file)
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index c968583a8e1be016c1c3557d64ca6fef9845d3b2..9bf2a02f77d8e949a9943483c5399bc71565fbe4 100644 (file)
@@ -6,8 +6,7 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
 OCC_LIBS = 
 
@@ -95,8 +94,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index d35ddaf34818a36f559338b87eda11092739d40b..b7a51d410197e826486b870bdde92503cf70b461 100644 (file)
@@ -4,9 +4,8 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_CPPFLAGS = $(CASINC)
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH = ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib -lSUIT $${CAS_KERNEL} -lHTMLService
@@ -32,8 +31,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
index cb72a5f68ce8e2f9c50f6ce35bee55a40c742d99..e31167244d2a8f50fef24fcd57c4d544639a9c6d 100755 (executable)
@@ -359,7 +359,7 @@ void TableViewer_ViewWindow::exportData()
   exportData( fileName );
 }
 
-Handle(HTMLService_HTMLTable) TableViewer_ViewWindow::exportTableData()
+Handle(HTMLService_HTMLTable) TableViewer_ViewWindow::exportToHTML()
 {
   int rows = numRows( Cells );
   int cols = numCols( Cells );
@@ -394,7 +394,7 @@ void TableViewer_ViewWindow::exportData( const QString& theFileName )
 {
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
-  exportTableData()->GenerateFile( TableViewer_Tool::ToExtString( theFileName ), true );
+  exportToHTML()->GenerateFile( TableViewer_Tool::ToExtString( theFileName ), true );
 
   QApplication::restoreOverrideCursor();
 }
@@ -540,3 +540,4 @@ QtxTable* TableViewer_ViewWindow::createTable()
            this, SLOT( selectionChanged() ) );
   return aTable;
 }
+
index 7fdea5fcd1efd680983388db2e0aef3256068f00..ee78790562683b2e1f45ce1d3af12a2d01c1b907 100755 (executable)
@@ -52,7 +52,7 @@ public:
 
   void                exportData();
   void                exportData( const QString& );
-  Handle(HTMLService_HTMLTable) exportTableData();
+  Handle(HTMLService_HTMLTable) exportToHTML();
 
   void                copyData();
   void                pasteData();
@@ -110,4 +110,3 @@ private:
 };
 
 #endif // !defined(TABLEVIEWER_VIEWWINDOW_H)
-
index 4ee1e29b6a69299dd375971703f8b680c13c8c0b..96bf750ee84a4362f24cfd8946f6cc235d27e72b 100644 (file)
@@ -6,10 +6,9 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
@@ -74,8 +73,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS