Add support for Qt

6 files changed, 34 insertions, 9 deletions

diff --git a/test/windows/README b/test/windows/README
index 5ab3c76..4d2e4ae 100644
--- a/test/windows/README
+++ b/test/windows/README
@@ -19,11 +19,14 @@ Steps:
    mysql
    mysql64
    sqlite
+   boost
+   qtcore
    odb/libodb
    odb/libodb-tracer
    odb/libodb-sqlite
    odb/libodb-mysql
    odb/libodb-boost
+   odb/libodb-qt
 
    And bin directory for
 
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat
index efe9c2a..4169c36 100755
--- a/test/windows/odb/build.bat
+++ b/test/windows/odb/build.bat
@@ -82,8 +82,8 @@ for %%d in (libodb libodb-tracer libodb-%1 libodb-boost libodb-qt) do (
 if not "_%failed%_" == "__" goto error
 
 for %%c in (%confs%) do (
-    for %%p in (%plats%) do (
-      call :run_build odb-examples-%1/examples-%1-vc%vcver%.sln %%c %%p
+  for %%p in (%plats%) do (
+    call :run_build odb-examples-%1/examples-%1-vc%vcver%.sln %%c %%p
   )
 )
 
@@ -98,8 +98,8 @@ for %%c in (%confs%) do (
 if not "_%failed%_" == "__" goto error
 
 for %%c in (%confs%) do (
-    for %%p in (%plats%) do (
-      call :run_build odb-examples-%1/qt/qt-%1-vc%vcver%.sln %%c %%p
+  for %%p in (%plats%) do (
+    call :run_build odb-examples-%1/qt/qt-%1-vc%vcver%.sln %%c %%p
   )
 )
 
diff --git a/test/windows/odb/default.options b/test/windows/odb/default.options
index 97bcb9e..4c3e944 100644
--- a/test/windows/odb/default.options
+++ b/test/windows/odb/default.options
@@ -1 +1,3 @@
 -I C:\projects\boost
+-I C:\projects\qtcore\include
+-I C:\projects\qtcore\include\QtCore
diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index 256d06c..9065265 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -24,9 +24,11 @@ ROOT=/c/projects
 MYSQL=$ROOT/mysql-mingw32
 SQLITE=$ROOT/sqlite-mingw32
 BOOST=$ROOT/boost-mingw32
+QTCORE=$ROOT/qtcore-mingw32
 
-CPPFLAGS="-I$BOOST -I$SQLITE -I$MYSQL/include"
-LDFLAGS="-L$BOOST/stage/lib -L$SQLITE -L$MYSQL/lib -Wl,--enable-auto-import"
+CPPFLAGS="-I$BOOST -I$QTCORE/include -I$QTCORE/include/QtCore -I$SQLITE -I$MYSQL/include"
+LDFLAGS="-L$BOOST/stage/lib -L$QTCORE/lib -L$SQLITE -L$MYSQL/lib -Wl,--enable-auto-import"
+PATH="$QTCORE/bin:$PATH"
 
 mysql_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql.exe"
 sqlite_options="--with-sqlite-db=c:\\projects\\odb\\odb_test.db"
@@ -69,6 +71,7 @@ if [ $rebuild = y ]; then
   clean libodb-mysql
   clean libodb-tracer
   clean libodb-boost
+  clean libodb-qt
 
   for d in $db; do
     rm -rf odb-tests-$d
@@ -122,6 +125,17 @@ fi
 make
 cd ..
 
+# Build libodb-qt
+#
+cd libodb-qt
+
+if [ $rebuild = y -o ! -f Makefile ]; then
+  ./configure --with-libodb=../libodb CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
+fi
+
+make
+cd ..
+
 # Build odb-tests
 #
 for d in $db; do
@@ -137,6 +151,7 @@ for d in $db; do
 --with-libodb-$d=../libodb-$d \
 --with-libodb-tracer=../libodb-tracer \
 --with-libodb-boost=../libodb-boost \
+--with-libodb-qt=../libodb-qt \
 ${!optvar} \
 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" DIFFFLAGS=-ubB
   fi
@@ -162,6 +177,7 @@ for d in $db; do
 --with-libodb=../libodb \
 --with-libodb-$d=../libodb-$d \
 --with-libodb-boost=../libodb-boost \
+--with-libodb-qt=../libodb-qt \
 ${!optvar} \
 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" DIFFFLAGS=-ubB
   fi
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index 19f6bd8..904468b 100755
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -4,11 +4,12 @@ set ODB=c:\projects\odb
 set MYSQL=c:\projects\mysql
 set MYSQL64=c:\projects\mysql64
 set SQLITE=c:\projects\sqlite
+set QTCORE=c:\projects\qtcore
 set "DIFF=c:\cygwin\bin\diff.exe -ubB"
 rem set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
 set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
-set PATH=%ODB%\odb-tests\libcommon\bin;%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-tracer\bin;%ODB%\libodb-boost\bin;%MYSQL%\bin;%SQLITE%\bin;%PATH%
-set PATH=%ODB%\odb-tests\libcommon\bin64;%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-tracer\bin64;%ODB%\libodb-boost\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PATH%
+set PATH=%ODB%\odb-tests\libcommon\bin;%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-tracer\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%QTCORE%\lib;%PATH%
+set PATH=%ODB%\odb-tests\libcommon\bin64;%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-tracer\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%QTCORE%\lib64;%PATH%
 
 if "_%1_" == "__" goto end
 
diff --git a/test/windows/odb/unpack b/test/windows/odb/unpack
index 6570816..bf98d5c 100755
--- a/test/windows/odb/unpack
+++ b/test/windows/odb/unpack
@@ -35,7 +35,7 @@ else
 fi
 
 rm -rf libodb libodb-sqlite libodb-mysql libodb-tracer libodb-boost \
-odb odb-tests-* odb-examples-*
+libodb-qt odb odb-tests-* odb-examples-*
 
 v=`echo $base/libodb-?.*.zip | sed -e "s%$base/libodb-\(.*\).zip%\1%"`
 
@@ -56,6 +56,9 @@ mv libodb-mysql-$v libodb-mysql
 unzip -q $base/libodb-boost-$v.zip
 mv libodb-boost-$v libodb-boost
 
+unzip -q $base/libodb-qt-$v.zip
+mv libodb-qt-$v libodb-qt
+
 unzip -q $base/odb-tests-$v.zip
 if [ $mingw = n ]; then
   for d in $databases; do