From 40b57160805cceabd157cdf3d2ceae0fab81f676 Mon Sep 17 00:00:00 2001
From: bugmaster <>
Date: Wed, 25 May 2011 07:54:03 +0000
Subject: [PATCH] Linking with FreeImage product

---
 samples/qt/IESample/IESample.pro | 4 ++++
 samples/qt/Tutorial/Tutorial.pro | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index fe644d9b80..a22df97153 100644
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -28,6 +28,10 @@ unix {
     INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
     LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    FREEIMAGE_DIR = $$(FREEIMAGEDIR)
+    exists($$FREEIMAGE_DIR) {
+	LIBS += -L$(FREEIMAGEDIR)/lib -lfreeimageplus
+    }
     TBB_LIB = $$(TBBLIB)
     exists($$TBB_LIB) {
 	LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc
diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 3dd566df82..8ffd6f42e6 100755
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -29,6 +29,10 @@ unix {
     INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H
     LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    FREEIMAGE_DIR = $$(FREEIMAGEDIR)
+    exists($$FREEIMAGE_DIR) {
+	LIBS += -L$(FREEIMAGEDIR)/lib -lfreeimageplus
+    }
     TBB_LIB = $$(TBBLIB)
     exists($$TBB_LIB) {
 	LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc
@@ -144,7 +148,7 @@ LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
 lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
-lrelease.input = TS_FILES
+lrelease.input = TRANSLATIONS
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
 QMAKE_EXTRA_COMPILERS += lrelease