Fixed inconsistent rounding of square cap pens.

[profile/ivi/qtbase.git] / configure.bat

diff --git a/configure.bat b/configure.bat
index b5ffb14..b8bbf29 100644 (file)
--- a/configure.bat
+++ b/configure.bat
@@ -42,12 +42,12 @@
 @echo off
 set QTSRC=%~dp0
 set QTDIR=%CD%
+if not exist %QTSRC%\.gitignore goto sconf
 if exist configure.exe goto conf
 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
@@ -57,17 +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 -module QtCore -outdir %QTDIR% %QTSRC%
     if errorlevel 1 goto exit
-    set nosyncqt=-no-syncqt
-)
-
-if not exist src\corelib\global\qconfig.h (
-    if not exist src\corelib\global (
-        md src\corelib\global
-        if errorlevel 1 goto exit
-    )
-    echo /* Generated by configure.bat - DO NOT EDIT! */ > src\corelib\global\qconfig.h
 )
 
 if not exist tools\configure (
@@ -115,5 +106,9 @@ if errorlevel 1 (cd ..\.. & exit /b 1)
 cd ..\..
 
 :conf
-configure.exe -srcdir %QTSRC% %* %nosyncqt%
+configure.exe -srcdir %QTSRC% %*
+goto exit
+
+:sconf
+%QTSRC%\configure.exe %*
 :exit