2 files changed, 14 insertions, 3 deletions
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat
index a929aa3..1cc64c2 100755
--- a/test/windows/odb/build.bat
+++ b/test/windows/odb/build.bat
@@ -39,6 +39,7 @@ if "_%~5_" == "__" (
 
 set "failed="
 
+if "_%2_" == "_0_" set "qtver=0"
 if "_%2_" == "_4_" set "qtver=4"
 if "_%2_" == "_5_" set "qtver=5"
 
@@ -47,6 +48,7 @@ if "_%qtver%_" == "__" (
   goto usage
 )
 
+if "_%3_" == "_8_" set "vcver=8"
 if "_%3_" == "_9_" set "vcver=9"
 if "_%3_" == "_10_" set "vcver=10"
 if "_%3_" == "_11_" set "vcver=11"
@@ -92,6 +94,9 @@ for %%d in (libodb libodb-%1 libodb-boost) do (
   )
 )
 
+if not "_%failed%_" == "__" goto error
+
+if "_%qtver%_" == "_0_" goto skip_libodb_qt
 for %%d in (libodb-qt) do (
   for %%c in (%confs%) do (
       for %%p in (%plats%) do (
@@ -99,8 +104,8 @@ for %%d in (libodb-qt) do (
     )
   )
 )
-
 if not "_%failed%_" == "__" goto error
+:skip_libodb_qt
 
 for %%c in (%confs%) do (
   for %%p in (%plats%) do (
@@ -118,13 +123,14 @@ for %%c in (%confs%) do (
 
 if not "_%failed%_" == "__" goto error
 
+if "_%qtver%_" == "_0_" goto skip_qt_examples
 for %%c in (%confs%) do (
   for %%p in (%plats%) do (
     call :run_build odb-examples-%1/qt/qt%qtver%-%1-vc%vcver%.sln %%c %%p
   )
 )
-
 if not "_%failed%_" == "__" goto error
+:skip_qt_examples
 
 cd odb-tests-%1
 call build.bat %1 %3 %4 %5 %action%
@@ -139,13 +145,17 @@ if errorlevel 1 (
   cd ..\..
   goto error
 )
+cd ..
 
-cd ..\qt
+if "_%qtver%_" == "_0_" goto skip_qt_tests
+cd qt
 call build.bat %1 %2 %3 %4 %5 %action%
 if errorlevel 1 (
   cd ..\..
   goto error
 )
+cd ..
+:skip_qt_tests
 
 echo.
 echo ALL BUILDS SUCCEEDED
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index f9fdea8..da6df94 100644
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -19,6 +19,7 @@ set QTCORE=c:\projects\qtcore-vc%1.0
 set QTCORE64=c:\projects\qtcore64-vc%1.0
 rem set "NLS_LANG=AMERICA_AMERICA.WE8MSWIN1252"
 set "DIFF=c:\cygwin\bin\diff.exe -ubB"
+if "_%1_" == "_8_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 8\Common7\IDE\devenv.com"
 if "_%1_" == "_9_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
 if "_%1_" == "_10_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
 if "_%1_" == "_11_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com"