diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro index 3bd3a3e329..aef4913464 100755 --- 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 4597f54feb..b5eea5240f 100644 --- 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 9a6500928e..d9705989ff 100755 --- 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 70f36037f9..4ac6a0e3ff 100755 --- 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 e26767091f..eef770d4ef 100755 --- 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 b3bf9b3974..30e58ed287 100644 --- 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 f07d77e7fb..c5f9813aef 100755 --- 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 4597f54feb..b5eea5240f 100644 --- 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 9a6500928e..d9705989ff 100755 --- 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 1516692cd2..2cff47e14f 100755 --- 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 e26767091f..eef770d4ef 100755 --- 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 eb1903d186..ef41b1da06 100644 --- 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)