Testing 5.10

qt.bat

@@ -14,14 +14,10 @@ IF NOT "%1"=="" (
     IF "%1"=="build" (
         call tools\build_qt.bat
     )
-    IF "%1"=="icu" (
-        call tools\build_icu.bat
-    )
     IF "%1"=="openssl" (
         call tools\build_openssl.bat
     )
     IF "%1"=="deps" (
-        call tools\build_icu.bat
         call tools\build_openssl.bat
     )
     IF "%1"=="extra" (
@@ -32,8 +28,7 @@ IF NOT "%1"=="" (
 ) ELSE (
     echo Available commands:
     echo download: Download and extracts required sources
-    echo deps : Build all dependencies for Qt ^(ICU, OpenSSL^)
-    echo icu : Build icu ^(Optional^)
+    echo deps : Build all dependencies for Qt ^(OpenSSL^)
     echo openssl : Build OpenSSL
     echo setup : Setup Qt
     echo build : build Qt

tools/build_openssl.bat

@@ -2,8 +2,11 @@
 setlocal
 
 set SSLRELEASE=1.0.x
+set SSLARCH=WIN32
 IF NOT v%SSLVER:1.1.v=%==v%SSLVER%l set SSLRELEASE=1.1.x
 
+IF %VSCMD_ARG_TGT_ARCH% == x64 set SSLARCH=WIN64A
+
 echo Configuring OpenSSL %SSLRELEASE%...
 IF exist %SSLINSTALLDIR% (
     echo OpenSSL already installed!
@@ -19,7 +22,7 @@ IF exist %SSLINSTALLDIR% (
             md build
             cd build
 
-            start /W /BELOWNORMAL "Configuring OpenSSL..." perl ..\Configure VC-WIN32 no-asm enable-static-engine no-shared --prefix=%SSLINSTALLDIR%
+            start /W /BELOWNORMAL "Configuring OpenSSL..." perl ..\Configure VC-%SSLARCH% no-asm enable-static-engine no-shared --prefix=%SSLINSTALLDIR%
 
             echo Building OpenSSL...
             start /W /BELOWNORMAL "Building OpenSSL..." nmake clean all
@@ -31,11 +34,11 @@ IF exist %SSLINSTALLDIR% (
 
         ) ELSE (
 
-            start /W /BELOWNORMAL "Configuring OpenSSL..." perl Configure VC-WIN32 no-asm enable-static-engine --prefix=%SSLINSTALLDIR%
+            start /W /BELOWNORMAL "Configuring OpenSSL..." perl Configure VC-%SSLARCH% no-asm enable-static-engine --prefix=%SSLINSTALLDIR%
             start /W /BELOWNORMAL "Configuring OpenSSL - 2..." ms\do_nt ^&^& exit
 
             echo Building OpenSSL...
-            start /W /BELOWNORMAL "Building OpenSSL..." nmake -f ms\nt.mak clean all
+            start /W /BELOWNORMAL "Building OpenSSL..." nmake -f ms\nt.mak all
             IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
             echo Installing OpenSSL...

tools/build_qt_extras.bat

@@ -1,20 +1,20 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-set EXTPATH=%SRCDIR%\%EXTNAME%-opensource-src-%QTVER%
+set EXTPATH=%SRCDIR%\%EXTNAME%-everywhere-src-%QTVER%
 set QMAKE=%QTINSTALLDIR%\bin\qmake.exe
 
 IF NOT "%EXTNAME%"=="" (
 
     echo PATH: %EXTPATH%
     echo QMAKE: %QMAKE%
 
-    set URL=http://download.qt.io/%QTRELEASE%_releases/qt/%QTVER:~0,3%/%QTVER%/submodules/%EXTNAME%-opensource-src-%QTVER%.zip
+    set URL=http://download.qt.io/%QTRELEASE%_releases/qt/%QTVER:~0,-2%/%QTVER%/submodules/%EXTNAME%-everywhere-src-%QTVER%.zip
 
     cd %SRCDIR%
     echo Downloading !URL!
     curl %CURLOPTS% !URL!
-    7z %ZOPTS% %EXTNAME%-opensource-src-%QTVER%.zip || exit /b %errorlevel%
+    7z %ZOPTS% %EXTNAME%-everywhere-src-%QTVER%.zip || exit /b %errorlevel%
     cd ..
 
     cd %EXTPATH% ||  exit /b %errorlevel%

tools/download.bat

@@ -9,12 +9,6 @@ echo Downloading %QTURL%
 curl %CURLOPTS% %QTURL% 
 7z %ZOPTS% qtbase-everywhere-src-%QTVER%.zip || exit /b %errorlevel%
 
-echo Downloading %ICUURL%
-curl %CURLOPTS% %ICUURL%
-7z %ZOPTS% icu4c-%ICUVER_UNDERSCORE%-src.zip || exit /b %errorlevel%
-rd /S /Q icu-%ICUVER%
-ren icu icu-%ICUVER% ||  exit /b %errorlevel%
-
 echo Downloading %SSLURL%
 curl %CURLOPTS% %SSLURL%
 7z %ZOPTS% openssl-%SSLVER%.tar.gz ||  exit /b %errorlevel%

tools/msvc-desktop.conf

@@ -8,19 +8,20 @@
 # Version-specific settings go in msvc-version.conf (loaded by default_pre)
 #
 
-include(angle.conf)
-
 MAKEFILE_GENERATOR      = MSVC.NET
 QMAKE_PLATFORM          = win32
 QMAKE_COMPILER          = msvc
 CONFIG                 += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-DEFINES                += UNICODE WIN32
+DEFINES                += UNICODE _UNICODE WIN32
 QMAKE_COMPILER_DEFINES += _WIN32
 contains(QMAKE_TARGET.arch, x86_64) {
     DEFINES += WIN64
     QMAKE_COMPILER_DEFINES += _WIN64
 }
 
+QMAKE_CFLAGS_OPTIMIZE      = -O1
+QMAKE_CFLAGS_OPTIMIZE_SIZE = -O1
+
 QMAKE_CC                = cl
 QMAKE_LEX               = flex
 QMAKE_LEXFLAGS          =
@@ -29,8 +30,8 @@ QMAKE_YACCFLAGS         = -d
 QMAKE_CFLAGS            = -nologo -Zc:wchar_t -Gy -EHsc
 QMAKE_CFLAGS_WARN_ON    = -W3
 QMAKE_CFLAGS_WARN_OFF   = -W0
-QMAKE_CFLAGS_RELEASE    = -O1 -MT
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O1 -MT -Zi
+QMAKE_CFLAGS_RELEASE    = $$QMAKE_CFLAGS_OPTIMIZE -MT
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -MT -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MTd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
@@ -46,6 +47,8 @@ QMAKE_CFLAGS_SSE3       = $$QMAKE_CFLAGS_SSE2
 QMAKE_CFLAGS_SSSE3      = $$QMAKE_CFLAGS_SSE2
 QMAKE_CFLAGS_SSE4_1     = $$QMAKE_CFLAGS_SSE2
 QMAKE_CFLAGS_SSE4_2     = $$QMAKE_CFLAGS_SSE2
+QMAKE_CFLAGS_AESNI      = $$QMAKE_CFLAGS_SSE2
+QMAKE_CFLAGS_SHANI      = $$QMAKE_CFLAGS_SSE2
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
@@ -87,7 +90,6 @@ QMAKE_EXTENSION_SHLIB   = dll
 QMAKE_PREFIX_STATICLIB  =
 QMAKE_EXTENSION_STATICLIB = lib
 
-QMAKE_LIBS_CORE         = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
 QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
 QMAKE_LIBS_NETWORK      = ws2_32.lib
 QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib
@@ -97,12 +99,13 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_IDL               = midl
+QMAKE_IDL               = midl /NOLOGO
 QMAKE_LIB               = lib /NOLOGO
-QMAKE_RC                = rc
+QMAKE_RC                = rc /NOLOGO
 
 VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln
 VCPROJ_KEYWORD          = Qt4VSv1.0
 
-include(windows-gles.conf)
+include(angle.conf)
+include(windows-vulkan.conf)

tools/options.bat

@@ -1,15 +1,17 @@
 @echo off
 
-set STARTDIR=%CD%
-set SRCDIR=%CD%\sources
-set BUILDDIR=%CD%\build
-
 set PLATFORM=win32-msvc2017
 set QTVER=5.10.0
 set ICUVER=60.1
 set SSLVER=1.1.0g
+set PREFIX=C:\Qt
 
-set QTINSTALLDIR=C:\Qt\%QTVER%-static
+REM DO NOT EDIT BELOW THIS LINE
+
+set STARTDIR=%CD%
+set SRCDIR=%CD%\sources
+set BUILDDIR=%CD%\build
+set QTINSTALLDIR=%PREFIX%\%QTVER%\%PLATFORM%-static
 
 set QTRELEASE=official
 for %%A in (alpha beta rc) DO (echo.%QTVER% | find /I "%%A">Nul && set QTRELEASE=development)
@@ -18,11 +20,6 @@ set QTURL=http://download.qt.io/%QTRELEASE%_releases/qt/%QTVER:~0,-2%/%QTVER%/su
 set QTDIR=%SRCDIR%\qtbase-everywhere-src-%QTVER%
 set QTBUILDDIR=%QTDIR%\build
 
-call set ICUVER_UNDERSCORE=%%ICUVER:.=_%%
-set ICUURL=http://download.icu-project.org/files/icu4c/%ICUVER%/icu4c-%ICUVER_UNDERSCORE%-src.zip
-set ICUBUILDDIR=%SRCDIR%\icu-%ICUVER%
-set ICUINSTALLDIR=%QTINSTALLDIR%\icu
-
 set SSLURL=https://www.openssl.org/source/openssl-%SSLVER%.tar.gz
 set SSLBUILDDIR=%SRCDIR%\openssl-%SSLVER%
 set SSLINSTALLDIR=%QTINSTALLDIR%\openssl

tools/setup_qt.bat

@@ -1,14 +1,6 @@
 @echo off
 setlocal
 
-IF exist %ICUINSTALLDIR% (
-    echo Found ICU
-) ELSE (
-    echo Could not find ICU in %ICUINSTALLDIR%
-    echo use "qt.bat icu" to install it. Continuing without it...
-    pause
-)
-
 IF exist %SSLINSTALLDIR% (
     echo Found OpenSSL
 ) ELSE (
@@ -39,7 +31,7 @@ md %QTBUILDDIR%
 cd %QTBUILDDIR%  ||  exit /b %errorlevel%
 
 echo Configuring Qt...
-start /W /BELOWNORMAL "Configuring Qt..." %QTDIR%\configure.bat -prefix %QTINSTALLDIR% -platform %PLATFORM% -opensource -release -confirm-license -opengl dynamic -mp -static -no-shared -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre -angle -nomake examples -openssl-linked -I %SSLINSTALLDIR%\include -L %SSLINSTALLDIR%\lib -I %ICUINSTALLDIR%\include -L %ICUINSTALLDIR%\lib ^&^& exit
+start /W /BELOWNORMAL "Configuring Qt..." %QTDIR%\configure.bat -prefix %QTINSTALLDIR% -platform %PLATFORM% -opensource -release -confirm-license -opengl dynamic -mp -static -static-runtime -no-shared -qt-libpng -qt-libjpeg -qt-zlib -qt-pcre -angle -nomake examples -openssl-linked -I %SSLINSTALLDIR%\include -L %SSLINSTALLDIR%\lib ^&^& exit
 IF %errorlevel% NEQ 0 exit /b %errorlevel%
 
 echo Configuration complete