diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-06-07 11:07:35 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-10-11 11:10:08 +0000 |
| commit | e36f73945c6f8e374b931cc33f2708e696797d1b (patch) | |
| tree | fbce80be575383a8afb4f8a441d519afb322b716 /scripts | |
| parent | 8a807533ae6b2cccb022ecc6cf436ac2f6a7339f (diff) | |
Update windowsservercore/Dockerfile
- Update qbs to 1.12.1
- Update Qt to 5.12.5
We're not using the installer anymore, because
a) the unattended-install-hack doesn't work for newer Qt installers
b) newer installers do not provide VS 2015 builds.
c) it allows us to tailor the Qt build to our needs in the future.
We're not building the documentation on Windows anymore due to the
genius move to require libclang for qdoc. That means we need
additional twiddling with the packages to add documentation that was
built on an usable OS.
Task-number: QBS-1438
Change-Id: I77a487562c2f5edd69b8b8a10ef3410ab599dc92
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make-release-archives.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat index f4e85f63c..867fa773c 100644 --- a/scripts/make-release-archives.bat +++ b/scripts/make-release-archives.bat @@ -67,7 +67,7 @@ subst Q: "%CD%" && Q: qbs build --settings-dir "%builddir%\.settings"^ -f qbs.qbs -d "%builddir%\build"^ - -p dist qbs.buildVariant:release "products.qbs archive.includeTopLevelDir:true"^ + -p dist qbs.buildVariant:release project.withDocumentation:false "products.qbs archive.includeTopLevelDir:true"^ config:release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^ config:release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b |