0026942: Training material are not built on OCCT installed after building by cmake...

Environment variable QT_DIR was renamed to QTDIR.

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index 3bd3a3e32904b34a4cfafe48f0cea046dcd98cc4..aef4913464a3fc346fc19370bb7e18ccd6dfcf57 100755 (executable)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -61,13 +61,13 @@ win32 {
         DESTDIR = ./win$(ARCH)/$(VCVER)/bind
         OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
         MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
-        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
+        LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
     } else {
         DEFINES += NDEBUG
         DESTDIR = ./win$(ARCH)/$(VCVER)/bin
         OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
         MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
-        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
+        LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
     DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }

diff --git a/samples/qt/IESample/custom.bat b/samples/qt/IESample/custom.bat
index 4597f54febab6dd63e320b86039dda52509f1de8..b5eea5240ffb7b94aac8cedad6aefc6357411f61 100644 (file)
--- a/samples/qt/IESample/custom.bat
+++ b/samples/qt/IESample/custom.bat
@@ -1,4 +1,4 @@
 @echo off
-rem Define QT_DIR variables in order to load OCCT environment
+rem Define QTDIR variable
 
-set "QT_DIR="
+set "QTDIR="

diff --git a/samples/qt/IESample/custom.sh b/samples/qt/IESample/custom.sh
index 9a6500928ef798a397c9384af1f21dc80cdf373e..d9705989ff01f0818e8ed492294f5586a024ee4a 100755 (executable)
--- a/samples/qt/IESample/custom.sh
+++ b/samples/qt/IESample/custom.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-#Define QT_DIR variables in order to generate Makefile files by qmake
+#Define QTDIR variable
 
-export QT_DIR=""
+export QTDIR=""

diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat
index 70f36037f9d4fe9ce8da2dbd4271fcf313886439..4ac6a0e3ff52487a306e751f42ce9f199c2ccb8a 100755 (executable)
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -8,5 +8,5 @@ set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_IEResourcesDefaults=%RES_DIR%"
 
-set "PATH=%QT_DIR%/bin;%PATH%"
-set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"
\ No newline at end of file
+set "PATH=%QTDIR%/bin;%PATH%"
+set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
\ No newline at end of file

diff --git a/samples/qt/IESample/env.sh b/samples/qt/IESample/env.sh
index e26767091f671304553509a62cc17f94b26485c4..eef770d4efc70531fa51f94aefe7f6e31f02d90d 100755 (executable)
--- a/samples/qt/IESample/env.sh
+++ b/samples/qt/IESample/env.sh
@@ -10,8 +10,8 @@ if [ -e "${aSamplePath}/../../../env.sh" ]; then
    source "${aSamplePath}/../../../env.sh";
 fi
 
-if test "${QT_DIR}" == ""; then
-   echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
+if test "${QTDIR}" == ""; then
+   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
    exit 1
 fi
 
@@ -19,4 +19,4 @@ host=`uname -s`
 export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
-export PATH=${QT_DIR}/bin:${PATH}
+export PATH=${QTDIR}/bin:${PATH}

diff --git a/samples/qt/IESample/genproj.bat b/samples/qt/IESample/genproj.bat
index b3bf9b3974bb85fdc841b62b0e00746c6f5ad4aa..30e58ed287529e25c2b0b7ab87d026d0888c334e 100644 (file)
--- a/samples/qt/IESample/genproj.bat
+++ b/samples/qt/IESample/genproj.bat
@@ -1,6 +1,6 @@
 @echo off
 REM Generation of vcproj files with qmake utilite
-REM Variable QT_DIR and PATH to qmake executable must be defined without fail
+REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index f07d77e7fb8a5b2f22fd8b168e839e1f515d9137..c5f9813aeff1ac0ec87a4aa1ade525f1b5dd0415 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -64,13 +64,13 @@ win32 {
         DESTDIR = ./win$(ARCH)/$(VCVER)/bind
         OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd
         MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd
-        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
+        LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd
     } else {
         DEFINES += NDEBUG
         DESTDIR = ./win$(ARCH)/$(VCVER)/bin
         OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj
         MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
-        LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
+        LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
     }
     DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }

diff --git a/samples/qt/Tutorial/custom.bat b/samples/qt/Tutorial/custom.bat
index 4597f54febab6dd63e320b86039dda52509f1de8..b5eea5240ffb7b94aac8cedad6aefc6357411f61 100644 (file)
--- a/samples/qt/Tutorial/custom.bat
+++ b/samples/qt/Tutorial/custom.bat
@@ -1,4 +1,4 @@
 @echo off
-rem Define QT_DIR variables in order to load OCCT environment
+rem Define QTDIR variable
 
-set "QT_DIR="
+set "QTDIR="

diff --git a/samples/qt/Tutorial/custom.sh b/samples/qt/Tutorial/custom.sh
index 9a6500928ef798a397c9384af1f21dc80cdf373e..d9705989ff01f0818e8ed492294f5586a024ee4a 100755 (executable)
--- a/samples/qt/Tutorial/custom.sh
+++ b/samples/qt/Tutorial/custom.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-#Define QT_DIR variables in order to generate Makefile files by qmake
+#Define QTDIR variable
 
-export QT_DIR=""
+export QTDIR=""

diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 1516692cd2bfc5b256e7a9c79f8a1904c0387366..2cff47e14f40b1abfad2244ed61ed0bbe3e0192f 100755 (executable)
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -8,5 +8,5 @@ set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_TutorialResourcesDefaults=%RES_DIR%"
 
-set "PATH=%QT_DIR%/bin;%PATH%"
-set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"
\ No newline at end of file
+set "PATH=%QTDIR%/bin;%PATH%"
+set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
\ No newline at end of file

diff --git a/samples/qt/Tutorial/env.sh b/samples/qt/Tutorial/env.sh
index e26767091f671304553509a62cc17f94b26485c4..eef770d4efc70531fa51f94aefe7f6e31f02d90d 100755 (executable)
--- a/samples/qt/Tutorial/env.sh
+++ b/samples/qt/Tutorial/env.sh
@@ -10,8 +10,8 @@ if [ -e "${aSamplePath}/../../../env.sh" ]; then
    source "${aSamplePath}/../../../env.sh";
 fi
 
-if test "${QT_DIR}" == ""; then
-   echo "Environment variable \"QT_DIR\" not defined. Define it in \"custom.sh\" script."
+if test "${QTDIR}" == ""; then
+   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
    exit 1
 fi
 
@@ -19,4 +19,4 @@ host=`uname -s`
 export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
-export PATH=${QT_DIR}/bin:${PATH}
+export PATH=${QTDIR}/bin:${PATH}

diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat
index eb1903d186f63264884acf47a1e3ea3e81e13b24..ef41b1da06f1ebe988e82284f1fdc9bfa8cb8164 100644 (file)
--- a/samples/qt/Tutorial/genproj.bat
+++ b/samples/qt/Tutorial/genproj.bat
@@ -1,6 +1,6 @@
 @echo off
 REM Generation of vcproj files with qmake utilite
-REM Variable QT_DIR and PATH to qmake executable must be defined without fail
+REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)