Porting to Qt4.

diff --git a/src/Makefile.am b/src/Makefile.am
index bb12f8c7b83f2bbd8d682a9456fd10b136e3501c..fc310ff247fa6942a9150f580d4a0920580d2db9 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,5 +71,5 @@ if GUI_ENABLE_CORBA
 #  SUBDIRS += RegistryDisplay TOOLSGUI \
 #          Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT
 # VSR: already migrated to Qt4 packages
-  SUBDIRS += RegistryDisplay TOOLSGUI
+  SUBDIRS += RegistryDisplay TOOLSGUI SalomeApp
 endif

diff --git a/src/SalomeApp/SalomeApp.pro b/src/SalomeApp/SalomeApp.pro
new file mode 100644 (file)
index 0000000..4086120
--- /dev/null
+++ b/src/SalomeApp/SalomeApp.pro
@@ -0,0 +1,93 @@
+TEMPLATE = lib
+TARGET = SalomeApp
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+QWT_INCLUDES = $$(QWTHOME)/include
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+HDF5_INCLUDES = $$(HDF5HOME)/include
+
+PYTHON_LIBS = -L$$(PYTHONHOME)/lib/python2.4/config -lpython2.4 -ldl -lutil
+
+QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL
+
+KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+
+
+INCLUDEPATH += $${PYTHON_INCLUDES} $${QT_INCLUDES} $${QWT_INCLUDES} $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} ../LightApp ../CAM ../Qtx ../SUIT ../OBJECT ../SVTK ../STD ../VTKViewer ../PyConsole ../TOOLSGUI ../PyInterp ../Session ../../idl ../Event ../../salome_adm/unix $${CORBA_INCLUDES} #../ObjBrowser
+
+LIBS += $${QT_MT_LIBS} $${PYTHON_LIBS} $${KERNEL_LDFLAGS} -lOpUtil -lSALOMELocalTrace -lSalomeDSClient -L../../lib -lsuit -lstd -lCAM -lSalomePrs -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPyConsole -lLogWindow -lLightApp -lToolsGUI $${CAS_KERNEL} #-lObjBrowser
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += SALOMEAPP_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = SalomeApp.h
+HEADERS += SalomeApp_Application.h
+HEADERS += SalomeApp_DataModel.h
+HEADERS += SalomeApp_DataObject.h
+HEADERS += SalomeApp_LoadStudiesDlg.h
+HEADERS += SalomeApp_Module.h
+HEADERS += SalomeApp_Study.h
+HEADERS += SalomeApp_ExceptionHandler.h
+HEADERS += SalomeApp_EventFilter.h
+HEADERS += SalomeApp_Tools.h
+HEADERS += SalomeApp_ImportOperation.h
+HEADERS += SalomeApp_Filter.h
+HEADERS += SalomeApp_TypeFilter.h
+HEADERS += SalomeApp_StudyPropertiesDlg.h
+HEADERS += SalomeApp_CheckFileDlg.h
+HEADERS += SalomeApp_VisualState.h
+
+SOURCES  = SalomeApp_Module.cxx
+SOURCES += SalomeApp_Application.cxx
+SOURCES += SalomeApp_DataModel.cxx
+SOURCES += SalomeApp_DataObject.cxx
+SOURCES += SalomeApp_LoadStudiesDlg.cxx
+SOURCES += SalomeApp_Study.cxx
+SOURCES += SalomeApp_ExceptionHandler.cxx
+SOURCES += SalomeApp_EventFilter.cxx
+SOURCES += SalomeApp_PyInterp.cxx
+SOURCES += SalomeApp_Tools.cxx
+SOURCES += SalomeApp_ImportOperation.cxx
+SOURCES += SalomeApp_Filter.cxx
+SOURCES += SalomeApp_TypeFilter.cxx
+SOURCES += SalomeApp_StudyPropertiesDlg.cxx
+SOURCES += SalomeApp_ListView.cxx
+SOURCES += SalomeApp_CheckFileDlg.cxx
+SOURCES += SalomeApp_VisualState.cxx
+
+TRANSLATIONS = resources/SalomeApp_images.ts \
+               resources/SalomeApp_msg_en.ts
+
+ICONS   = resources/*.png
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+resources.files = $$ICONS resources/*.qm
+resources.path = ../../resources
+
+INSTALLS += includes resources

diff --git a/src/src.pro b/src/src.pro
index 4ff8f15f9d66de4276c59ce407a0dfad2f048d03..fc54392e128c2d687329c39751c17ec68500a40c 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -26,3 +26,4 @@ SUBDIRS += LightApp
 SUBDIRS += ResExporter
 SUBDIRS += RegistryDisplay
 SUBDIRS += TOOLSGUI
+SUBDIRS += SalomeApp