Correction for .qm files creation. And it make undo for last temporarily integration.

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index f54e7d1201be6a63cf71dab973a37fe9cc581641..81e5dcbd4ba4831899c6c9104c920a9605f4b056 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -4,13 +4,8 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-VTKHOME = $$(VTKHOME)
-VTK_INCLUDES = $${VTKHOME}/include/vtk
-
-VTK_LIBS = -L$${VTKHOME}/lib/vtk -L$${VTKHOME}/lib/vtk/python -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
-
-INCLUDEPATH = ../../include $${VTK_INCLUDES}
-LIBS += -L../../$(CONFIG_ID)/lib $${VTK_LIBS} -lSUIT -lQtx -lTableViewer -lVTKViewer
+INCLUDEPATH = ../../include
+LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
@@ -25,13 +20,26 @@ SOURCES = *.cxx
 TRANSLATIONS = resources/STD_images.ts \
                resources/STD_msg_en.ts
 
-ICONS   = resources/*.png \
-         STD.xml
+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.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.input = TRANSLATIONS
+unix:lrelease.clean = $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.clean = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+lrelease.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += lrelease
+
+ICONS   = resources/*.png
 
 includes.files = $$HEADERS
 includes.path = ../../include
 
-resources.files = $$ICONS resources/*.qm resources/*.xml resources/*.ini
+resources.files = $$ICONS resources/*.xml resources/*.ini
 resources.path = ../../resources
 
 INSTALLS += includes resources