From 3ff084aa7910591fb67b2bd7028efab5543d5527 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Tue, 19 Apr 2011 16:28:25 +0200 Subject: [PATCH] Now using 'qtenv2.bat' rather than 'qtvars.bat', as the latter apparently isn't available in Qt SDK v1.1. --- etc/Deployment/_build.bat | 2 +- etc/Deployment/_lupdate.bat | 2 +- etc/Deployment/_paths.bat | 2 +- src/Config.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat index 16489696..7e46ef10 100644 --- a/etc/Deployment/_build.bat +++ b/etc/Deployment/_build.bat @@ -8,7 +8,7 @@ call "%~dp0\_paths.bat" if not "%LAMEXP_ERROR%"=="0" GOTO:EOF REM ----------------------------------------------------------------- call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 -call "%PATH_QTMSVC%\bin\qtvars.bat" +call "%PATH_QTMSVC%\bin\qtenv2.bat" REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean /verbosity:detailed %1 diff --git a/etc/Deployment/_lupdate.bat b/etc/Deployment/_lupdate.bat index 24892c4b..23bc1e3d 100644 --- a/etc/Deployment/_lupdate.bat +++ b/etc/Deployment/_lupdate.bat @@ -7,7 +7,7 @@ call "%~dp0\_paths.bat" if not "%LAMEXP_ERROR%"=="0" GOTO:EOF REM ----------------------------------------------------------------- call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 -call "%PATH_QTMSVC%\bin\qtvars.bat" +call "%PATH_QTMSVC%\bin\qtenv2.bat" REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" set "LST_FILE=%TEMP%\~list.%DATE:~6,4%-%DATE:~3,2%-%DATE:~0,2%.lst" diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat index 6d98391e..63d46979 100644 --- a/etc/Deployment/_paths.bat +++ b/etc/Deployment/_paths.bat @@ -56,7 +56,7 @@ if not exist "%PATH_UPXBIN%\upx.exe" GOTO:EOF if not exist "%PATH_MKNSIS%\makensis.exe" GOTO:EOF if not exist "%PATH_MSVC90%\VC\vcvarsall.bat" GOTO:EOF if not exist "%PATH_MSVC90%\VC\bin\cl.exe" GOTO:EOF -if not exist "%PATH_QTMSVC%\bin\qtvars.bat" GOTO:EOF +if not exist "%PATH_QTMSVC%\bin\qtenv2.bat" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\uic.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\moc.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\rcc.exe" GOTO:EOF diff --git a/src/Config.h b/src/Config.h index 3b3e3947..940ab495 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 451 +#define VER_LAMEXP_BUILD 452 /////////////////////////////////////////////////////////////////////////////// // Tools versions -- 2.11.0