diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-19 22:33:29 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-19 22:33:29 (GMT) |
| commit | ae1cb61204530099f438656226a4b24449658203 (patch) | |
| tree | 485a961f295ab0db5b60cdd62f6072ac2368dfe6 /bin | |
| parent | 55bddd50925da27f7a106041db44c15057aac6c1 (diff) | |
| parent | 02c15e6a8cdb0f8a0bb6ee36880877fe90334d69 (diff) | |
| download | Qt-ae1cb61204530099f438656226a4b24449658203.zip Qt-ae1cb61204530099f438656226a4b24449658203.tar.gz Qt-ae1cb61204530099f438656226a4b24449658203.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/cppcodemarker.cpp
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/setcepaths.bat | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat index 15d8ff8..914e594 100755 --- a/bin/setcepaths.bat +++ b/bin/setcepaths.bat @@ -79,6 +79,11 @@ checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_creat tmp_created_script_setup.bat del tmp_created_script_setup.bat echo Windows Mobile 6 Professional selected, environment is set up +) ELSE IF "%1" EQU "wincewm65professional-msvc2005" ( +checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL +tmp_created_script_setup.bat +del tmp_created_script_setup.bat +echo Windows Mobile 6 Professional selected, environment is set up ) ELSE IF "%1" EQU "wincewm60standard-msvc2005" ( checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL tmp_created_script_setup.bat @@ -124,6 +129,11 @@ checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_creat tmp_created_script_setup.bat del tmp_created_script_setup.bat echo Windows Mobile 6 Professional selected, environment is set up +) ELSE IF "%1" EQU "wincewm65professional-msvc2008" ( +checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL +tmp_created_script_setup.bat +del tmp_created_script_setup.bat +echo Windows Mobile 6 Professional selected, environment is set up ) ELSE IF "%1" EQU "wincewm60standard-msvc2008" ( checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL tmp_created_script_setup.bat |