From: vsr <vsr@opencascade.com>
Date: Tue, 15 Feb 2005 11:19:46 +0000 (+0000)
Subject: Modify project file to force Qt library to be at the first place before other librari... 
X-Git-Tag: SALOME_V_2_2_0~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4328fae0717d0f6ea78ccb35a2cbdeee898e8e93;p=tools%2Finstall.git

Modify project file to force Qt library to be at the first place before other libraries, otherwise linkage fails.
---

diff --git a/src/Makefile b/src/Makefile
index ac3fa76..ecfd306 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ../bin/SALOME_InstallWizard
-# Generated by qmake (1.03a) on: Tue Feb  8 18:14:31 2005
+# Generated by qmake (1.03a) on: Wed Feb  9 18:40:38 2005
 # Project:  SALOME_INSTALL.pro
 # Template: app
 # Command: $(QMAKE) SALOME_INSTALL.pro
@@ -19,7 +19,7 @@ YACCFLAGS= -d
 INCPATH  = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/default
 LINK     = g++
 LFLAGS   = 
-LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
+LIBS     = $(SUBLIBS)  -Wl,-rpath,$(QTDIR)/lib  -L$(QTDIR)/lib  -L/usr/X11R6/lib -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama -lqt-mt -lpthread -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
diff --git a/src/SALOME_INSTALL.pro b/src/SALOME_INSTALL.pro
index 835beea..38126b7 100644
--- a/src/SALOME_INSTALL.pro
+++ b/src/SALOME_INSTALL.pro
@@ -23,4 +23,4 @@ SOURCES		+= SALOME_XmlHandler.cxx
 SOURCES		+= SALOME_HelpWindow.cxx
 SOURCES		+= InstallWizard.cpp
 TARGET		= ../bin/SALOME_InstallWizard
-unix:LIBS       += -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama
+unix:LIBS       += -lqt-mt -ldl -lSM -lXrender -lpng -lmng -ljpeg -lGL -lXinerama