summaryrefslogtreecommitdiffstats
path: root/configure.bat
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-08-31 16:33:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-11 17:23:27 +0200
commit8d97eb298d9a3f3b0a9d98249966f2cd533a68a2 (patch)
treebdc020687dde77ea987baed477300b5040ac033c /configure.bat
parent8df98b43be26d003fcd9e602094c05607f59ab4f (diff)
introduce -minimal mode to syncqt and use it for bootstrapping
the bootstrap does not need CamelCase includes, deprecated headers and whatnot, so just don't do it. the full thing will be run on qtbase by qmake. Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure.bat')
-rw-r--r--configure.bat6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.bat b/configure.bat
index 3517424e8a..09f19fdd8d 100644
--- a/configure.bat
+++ b/configure.bat
@@ -48,7 +48,6 @@ echo Please wait while bootstrapping configure ...
for %%C in (cl.exe icl.exe g++.exe perl.exe) do set %%C=%%~$PATH:C
-set nosyncqt=
if not exist include (
if "%perl.exe%" == "" (
echo Perl not found in PATH. Aborting. >&2
@@ -58,9 +57,8 @@ if not exist include (
md mkspecs
if errorlevel 1 goto exit
)
- perl %QTSRC%bin\syncqt -outdir %QTDIR% %QTSRC%
+ perl %QTSRC%bin\syncqt -minimal -outdir %QTDIR% %QTSRC%
if errorlevel 1 goto exit
- set nosyncqt=-no-syncqt
)
if not exist src\corelib\global\qconfig.h (
@@ -116,7 +114,7 @@ if errorlevel 1 (cd ..\.. & exit /b 1)
cd ..\..
:conf
-configure.exe -srcdir %QTSRC% %* %nosyncqt%
+configure.exe -srcdir %QTSRC% %*
goto exit
:sconf