Update check Qt procedure for Qt 4.x

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index c058077fd0693a4fe7b94b7bf084885c6d9bd000..b67dd6797e76b8918f664eb8891062685375a161 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -64,7 +64,7 @@ COMMON_CPPFLAGS=\
        @PYTHON_INCLUDES@ \
        @MPI_INCLUDES@ \
        @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \
-       @QT_MT_INCLUDES@ \
+       @QT_INCLUDES@ \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \

diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am
index 6bee2cf3c56c4420a2c2d31c6412866c2a3de316..53f89d73d982ff908f6713ab8c8312f66db213e8 100644 (file)
--- a/src/LifeCycleCORBA/Makefile.am
+++ b/src/LifeCycleCORBA/Makefile.am
@@ -82,7 +82,7 @@ libSalomeLifeCycleCORBA_la_SOURCES  = \
 libSalomeLifeCycleCORBA_la_CPPFLAGS = \
        $(COMMON_CPPFLAGS) \
        @PYTHON_INCLUDES@ \
-       @QT_MT_INCLUDES@ \
+       @QT_INCLUDES@ \
        -I$(srcdir)/../Container \
        -I$(srcdir)/../Notification
 
@@ -112,7 +112,7 @@ Test_LifeCycleCORBA_LDADD    = \
        $(COMMON_LIBS) \
        @CORBA_LIBS@
 
-#CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES)
+#CPPFLAGS += $(PYTHON_INCLUDES) $(QT_INCLUDES)
 
 #LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager
 #LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics

diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index a29139fd2d5715fe642a36f0821439527e14b415..dcfb7ded643c094942b94658d79cce819ab1b4f8 100644 (file)
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -63,7 +63,7 @@ COMMON_CPPFLAGS=\
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
-       @QT_MT_INCLUDES@
+       @QT_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
@@ -86,7 +86,7 @@ libSalomeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0
 
 libSalomeCatalog_la_LIBADD  =\
        $(COMMON_LIBS) \
-       @QT_MT_LIBS@
+       @QT_LIBS@
 
 
 #

diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am
index eaa49f92aa9dbee23936d53124c44633fdfb8dbe..7770d4272fd7072b001d6fad55f29a1923d7fe29 100755 (executable)
--- a/src/ResourcesManager/Makefile.am
+++ b/src/ResourcesManager/Makefile.am
@@ -76,9 +76,9 @@ libSalomeResourcesManager_la_SOURCES =\
 
 libSalomeResourcesManager_la_CPPFLAGS =\
        $(COMMON_CPPFLAGS) \
-       @QT_MT_INCLUDES@
+       @QT_INCLUDES@
 
 libSalomeResourcesManager_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeResourcesManager_la_LIBADD  =\
        $(COMMON_LIBS) \
-       @QT_MT_LIBS@
+       @QT_LIBS@