0029010: Launch custom.bat in samples before calling general environment

Replace calling custom.bat and general env.bat in samples.

diff --git a/samples/qt/FuncDemo/env.bat b/samples/qt/FuncDemo/env.bat
index e00ecf874d8e0a1bb3810c9ccce084146fdd49f8..d0450d73cd5128522efc351e57cc8a8643329976 100644 (file)
--- a/samples/qt/FuncDemo/env.bat
+++ b/samples/qt/FuncDemo/env.bat
@@ -1,8 +1,8 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 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.bat b/samples/qt/IESample/env.bat
index 4ac6a0e3ff52487a306e751f42ce9f199c2ccb8a..90a5c2cebdff36c8ccf55c9d82f4c608665f2047 100755 (executable)
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,9 +1,9 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_IEResourcesDefaults=%RES_DIR%"

diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 2cff47e14f40b1abfad2244ed61ed0bbe3e0192f..781e09ef67a76b6d4a7b852536b79223752a54ba 100755 (executable)
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,9 +1,9 @@
 @echo off
 
-call "custom.bat" %1 %2 %3
-
 call "%~dp0..\..\..\env.bat" %1 %2 %3
 
+call "custom.bat" %1 %2 %3
+
 set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
 set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_TutorialResourcesDefaults=%RES_DIR%"