Compare commits

..

4 Commits
5.15 ... 5.15.2

Author SHA1 Message Date
Toni Saario
047db969c5 Add targets for qtsaferenderer
Task-number: COIN-619
Change-Id: I928f297001d0cb0a9870cb81b78e927512fa19aa
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2020-11-18 11:23:45 +02:00
Qt Submodule Update Bot
9b43a43ee9 Update submodules on '5.15.2' in qt/qt5
Change-Id: I010fbaba7bd3e824ab7f5e57fb7bf08d3cb5a3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-12 09:11:49 +00:00
Qt Submodule Update Bot
883da721db Update submodules on '5.15.2' in qt/qt5
Change-Id: I9d04fa7f3e553e176607d36ba142763173d0c42c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-10 10:35:45 +00:00
Jani Heikkinen
3681c2e27f Adjust submodule branches
Change-Id: I35b0ba3e1f36c7475145bf2b8268b46f7e53ce25
2020-10-27 07:31:20 +02:00
89 changed files with 262 additions and 538 deletions

84
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtsvg recommends = qtsvg
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtscript"] [submodule "qtscript"]
depends = qtbase depends = qtbase
recommends = qttools recommends = qttools
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.15 branch = 5.15.2
status = deprecated status = deprecated
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.15 branch = 5.15.2
status = deprecated status = deprecated
[submodule "qttranslations"] [submodule "qttranslations"]
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2 recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras recommends = qtdeclarative qtandroidextras
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
depends = qtdeclarative depends = qtdeclarative
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtgraphicaleffects recommends = qtgraphicaleffects
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtbase depends = qtbase
recommends = qtserialport recommends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtx11extras"] [submodule "qtx11extras"]
depends = qtbase depends = qtbase
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtmacextras"] [submodule "qtmacextras"]
depends = qtbase depends = qtbase
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwinextras"] [submodule "qtwinextras"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
depends = qtbase depends = qtbase
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtquickcontrols2"] [submodule "qtquickcontrols2"]
depends = qtgraphicaleffects depends = qtgraphicaleffects
recommends = qtimageformats recommends = qtimageformats
path = qtquickcontrols2 path = qtquickcontrols2
url = ../qtquickcontrols2.git url = ../qtquickcontrols2.git
branch = 5.15 branch = 5.15.2
status = essential status = essential
[submodule "qtpurchasing"] [submodule "qtpurchasing"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtandroidextras recommends = qtdeclarative qtandroidextras
path = qtpurchasing path = qtpurchasing
url = ../qtpurchasing.git url = ../qtpurchasing.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgamepad path = qtgamepad
url = ../qtgamepad.git url = ../qtgamepad.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtscxml"] [submodule "qtscxml"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebglplugin path = qtwebglplugin
url = ../qtwebglplugin.git url = ../qtwebglplugin.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtlottie"] [submodule "qtlottie"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = 5.15 branch = 5.15.2
status = addon status = addon
[submodule "qtquick3d"] [submodule "qtquick3d"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquick3d path = qtquick3d
url = ../qtquick3d.git url = ../qtquick3d.git
branch = 5.15 branch = 5.15.2
status = addon status = addon

View File

@@ -1,7 +1,7 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['DisableTests'] Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -11,32 +11,32 @@ Configurations:
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target arch: 'x86' Target arch: 'x86'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'x86' Target arch: 'x86'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['DisableTests'] Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'armv7' Target arch: 'armv7'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -48,11 +48,6 @@ Configurations:
Template: 'qtci-linux-Ubuntu-18.04-x86_64' Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC' Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
- -
Template: 'qtci-linux-Ubuntu-18.04-x86_64' Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC' Compiler: 'GCC'
@@ -86,7 +81,7 @@ Configurations:
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'

View File

@@ -2,12 +2,12 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'x86' Target arch: 'x86'
Features: ['Packaging'] Features: ['Packaging']

View File

@@ -2,13 +2,13 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Target arch: 'x86' Target arch: 'x86'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'

View File

@@ -1,13 +1,13 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'x86' Target arch: 'x86'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
@@ -17,29 +17,29 @@ Configurations:
Template: 'qtci-windows-7-x86-3' Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Features: ['Packaging'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'armv7' Target arch: 'armv7'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'multi' Target arch: 'multi'
Compiler: 'Mingw' Compiler: 'Mingw'
@@ -48,7 +48,7 @@ Configurations:
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'multi' Target arch: 'multi'
Compiler: 'Clang' Compiler: 'Clang'
@@ -56,14 +56,14 @@ Configurations:
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'QNX_700' Target os: 'QNX_700'
Target arch: 'x86' Target arch: 'x86'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['DisableTests'] Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'QNX_700' Target os: 'QNX_700'
Target arch: 'armv7' Target arch: 'armv7'
Compiler: 'Mingw' Compiler: 'Mingw'
@@ -71,7 +71,7 @@ Configurations:
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'QNX_700' Target os: 'QNX_700'
Target arch: 'armv8' Target arch: 'armv8'
Compiler: 'Mingw' Compiler: 'Mingw'
@@ -79,7 +79,7 @@ Configurations:
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'QNX_700' Target os: 'QNX_700'
Target arch: 'x86_64' Target arch: 'x86_64'
Compiler: 'Mingw' Compiler: 'Mingw'
@@ -101,14 +101,14 @@ Configurations:
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WebAssembly' Target os: 'WebAssembly'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Target os: 'WebAssembly' Target os: 'WebAssembly'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']

View File

@@ -13,7 +13,7 @@
Features: ['DisableTests'] Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'x86_64' Target arch: 'x86_64'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'

View File

@@ -1,5 +1,5 @@
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Target os: 'WinRT_10' Target os: 'WinRT_10'
Target arch: 'x86_64' Target arch: 'x86_64'
Compiler: 'MSVC2015' Compiler: 'MSVC2015'

View File

@@ -1,18 +1,33 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Environment variables: ['PATH=C:\MINGW730\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2015'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
- -
Template: 'qtci-linux-RHEL-7.6-x86_64' Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Packaging', 'DisableTests'] Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'

View File

@@ -2,12 +2,12 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
- -
Template: 'qtci-windows-10-x86_64-52' Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'x86' Target arch: 'x86'
Features: ['Packaging'] Features: ['Packaging']
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
- -
Template: 'qtci-macos-10.13-x86_64-3' Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging'] Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'

View File

@@ -1,5 +1,12 @@
# List about manual pre-installations to Tier1 image: # List about manual pre-installations to Tier1 image:
Virtual Hardware:
CPU: 4
Memory: 8 GB
Hard Disk: 550 GB
CI_NW
Video Card - total memory: 32MB
VM Options: VM Options:
Boot options/Firmware: BIOS Boot options/Firmware: BIOS
@@ -11,14 +18,6 @@ Windows 10 Enterprise
Region: Finland Region: Finland
Keyboard layout: United Kingdom Keyboard layout: United Kingdom
* Don't use online speech recognition
* Let Microsoft and apps use your location: no
* Find my devicer: no
* Send diagnostic data to Microsoft: Send required diagnostic data
* Imporve inking & typing: no
* Get tailored expreriences with diagnostic data: no
* Let apps use advertising ID: no
* VMware tools (complete) installed * VMware tools (complete) installed
* Resolution set to 1280x800 * Resolution set to 1280x800
* Coin-setup: * Coin-setup:
@@ -46,7 +45,12 @@ Keyboard layout: United Kingdom
* (Restart Windows) * (Restart Windows)
* Google Chrome installed for RTA * Google Chrome installed for RTA
* Virus & threat protection settings: * Virus & threat protection settings:
* Check that there's no active antivirus providers - Real-time protection -> off
* From 'Region Settings' - Cloud-delivered protection -> off
* Set Regional format: English (United States) - Automatic sample submission -> off
- Tamper protection -> off
* Virus & threat protection notifications:
- Get informational notifications -> off
- Account protection notifications -> off
* Activate Windows * Activate Windows

View File

@@ -1,6 +1,6 @@
########################################################################### ###########################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,6 +44,18 @@
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
# 'Windows Defender Cleanup' - "Periodic cleanup task."
DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
# 'Windows Defender Scheduled Scan' - "Periodic scan task."
DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
# 'Windows Defender Verification' - "Periodic verification task."
DisableSchedulerTask "Windows Defender\Windows Defender Verification"
# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
DisableSchedulerTask "Windows Error Reporting\QueueReporting" DisableSchedulerTask "Windows Error Reporting\QueueReporting"

View File

@@ -1,6 +1,6 @@
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,30 +30,23 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install Dotnet SDK which is required for Azure installation # Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version = "2.1" $version_number ="14.0.25420.1"
if (Is64BitWinHost) { $installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
$urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe"
$urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe"
$sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8"
} else {
$urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe"
$urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe"
$sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161"
}
$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe"
Write-Host "Installing Dotnet SDK $version"
Download $urlOfficial $urlCache $installer
Verify-Checksum $installer $sha1
Run-Executable "$installer" "/install /passive"
Prepend-Path "C:\Program Files\dotnet"
Remove $installer
Write-Output "Dotnet SDK = $version" >> ~/versions.txt
# default plus following components were selected:
# * Visual C++
# - Common Tools for Visual C++ 2015
# * Universal Windows App Development Tools
# - Tools (1.4.1) and Windows SDK (10.0.14393)
# - Windows 10 SDK (10.0.10586)
# - Windows 10 SDK (10.0.10240)
# * Common Tools
# -Visual Studio Extensibility Tools Update 3
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
echo "Visual Studio = $version version $version_number" >> ~\versions.txt

View File

@@ -1,18 +0,0 @@
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version_number ="14.0.25420.1"
$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
# default plus following components were selected:
# * Programming Languages
# * Visual C++
# - Common Tools for Visual C++ 2015
# * Universal Windows App Development Tools
# - Tools (1.4.1) and Windows SDK (10.0.14393)
# - Windows 10 SDK (10.0.10586)
# - Windows 10 SDK (10.0.10240)
# * Common Tools
# -Visual Studio Extensibility Tools Update 3
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

View File

@@ -2,13 +2,13 @@
$version = "2019" $version = "2019"
# Current version was manually upgraded from the installer # Current version was manually upgraded from the installer
$version_number = "16.8.1" $version_number = "16.6.2"
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
MSVC 2019 build tools (default installation, no additional selections). MSVC 2019 build tools (default installation, no additional selections).
* Install after MSVC2019 is installed! * Install after MSVC2019 is installed!
* Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
* Version: 16.8.1 * Version: 16.6.2
Installed MSVC-2019 Components: Installed MSVC-2019 Components:
@@ -38,10 +38,10 @@ Text Template Transformation
C# and Visual Basic Roslyn compilers C# and Visual Basic Roslyn compilers
C++ 2019 Redistributable Update C++ 2019 Redistributable Update
C++ Cmake tools for Windows C++ Cmake tools for Windows
C++/CLI support for v142 build tools /14.28) C++/CLI support for v142 build tools /14.26)
MSBuild MSBuild
MSVC v142 - VS 2019 C++ ARM build tools (v14.20) MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
MSVC v142 - VS 2019 C++ ARM build tools (v14.28) MSVC v142 - VS 2019 C++ ARM build tools (v14.26)
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26)
MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
@@ -57,7 +57,7 @@ Razor Language Services
Graphics debugger and GPU profiler for DirectX Graphics debugger and GPU profiler for DirectX
Image and 3D model editors Image and 3D model editors
C++ ATL for latest v142 build tools (x86 & x64) C++ ATL for latest v142 build tools (x86 & x64)
TypeScript 4.0 SDK TypeScript 3.8 SDK
Windows 10 SDK (10.0.16299.0) Windows 10 SDK (10.0.16299.0)
Windows 10 SDK (10.0.17134.0) Windows 10 SDK (10.0.17134.0)
Windows 10 SDK (10.0.17763.0) Windows 10 SDK (10.0.17763.0)

View File

@@ -4,22 +4,18 @@ Our vanilla images are pre-installed in VMware where we have networking availabl
use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch
to using the VirtIO NIC in KVM. to using the VirtIO NIC in KVM.
NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2 * Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso
* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso * Mount virtio-win-0.1.171.iso by double clicking it.
cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso
* Mount virtio-win-0.1.185.iso by double clicking it.
* Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
* Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
* Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install
* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install
* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64
Because vioscsi does not install the entries in windows registry before we actually Because vioscsi does not install the entries in windows registry before we actually
have a VirtIO device installed, and we can't boot with a VirtIO device before have a VirtIO device installed, and we can't boot with a VirtIO device before
the driver is installed, we have to blindly install the registry entries: the driver is installed, we have to blindly install the registry entries:
* Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
However, we've seen that the Owner in the registry can be wrong. This entry However, we've seen that the Owner in the registry can be wrong. This entry
sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

View File

@@ -55,8 +55,8 @@ toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip" toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r20" ndkVersion="r20"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="29.0.3" sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-29" sdkApiLevel="android-28"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"

View File

@@ -37,7 +37,7 @@
set -ex set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew install --build-from-source libusb brew install libusb
read -r -a arr <<< $(brew list --versions libusb) read -r -a arr <<< $(brew list --versions libusb)
version=${arr[1]} version=${arr[1]}
echo "libusb = $version" >> ~/versions.txt echo "libusb = $version" >> ~/versions.txt

View File

@@ -44,6 +44,8 @@ sw_vers >> ~/versions.txt
echo "***** All installed packages *****" >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt
echo "***** HomeBrew *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt
brew list --versions >> ~/versions.txt brew list --versions >> ~/versions.txt
echo "***** HomeBrew Casks*****" >> ~/versions.txt
brew cask list --versions >> ~/versions.txt
echo "***** Apple's installer *****" >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt
pkgutil --pkgs >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt echo "*********************************************" >> ~/versions.txt

View File

@@ -1,83 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
# This same script is used to provision libclang to Linux and macOS.
# In case of Linux, we expect to get the values as args
set -e
# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
libclang_version=10.0
if uname -a |grep -q Darwin; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z"
sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
elif test -f /etc/redhat-release || /etc/centos-release; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
sha1="1d2e265502fc0832a854f989d757105833fbd179"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
sha1="c1580acb3a82e193acf86f18afb52427c5e67de8"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
fi
zip="/tmp/libclang.7z"
destination="/usr/local/libclang-dynlibs-$version"
DownloadURL $url_cached $url $sha1 $zip
if command -v 7zr &> /dev/null; then
sudo 7zr x $zip -o/usr/local/
else
sudo 7z x $zip -o/usr/local/
fi
sudo mv /usr/local/libclang "$destination"
rm -rf $zip
echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile
echo "libClang for QtForPython= $version" >> ~/versions.txt

View File

@@ -1,2 +1,2 @@
Disable-NetAdapterLso "Ethernet 2" Disable-NetAdapterLso Ethernet
Start-Sleep -s 15 # Give windows some time to adjust network settings Start-Sleep -s 15 # Give windows some time to adjust network settings

View File

@@ -33,50 +33,46 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# This script will installs msys2 # This script installs 7-Zip
$version = "20200903" $version = "20181211"
$prog = "msys2" $prog = "msys2"
$arch = "x86_64" if (Is64BitWinHost) {
$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03" $arch = "x86_64"
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
$folder = "msys64" $folder = "msys64"
} else {
$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" $arch = "i686"
$sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
$folder = "msys32"
}
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package"
$PackagePath = "C:\Windows\Temp\$package"
$TargetLocation = "C:\Utils" $TargetLocation = "C:\Utils"
if ((Test-Path $url_cache_prebuilt)) { Download $url_official $url_cache $PackagePath
$PackagePath = "C:\Windows\Temp\$package_prebuilt" Verify-Checksum $PackagePath $sha1
Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath Extract-tar_gz $PackagePath $TargetLocation
Verify-Checksum $PackagePath $sha1_prebuilt $msys = "$TargetLocation\$folder\msys2_shell.cmd"
Extract-7Zip $PackagePath $TargetLocation
} else {
$PackagePath = "C:\Windows\Temp\$package"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl # install perl
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Start-Sleep -s 60 Start-Sleep -s 30
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`"" cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
Start-Sleep -s 360 Start-Sleep -s 180
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
Write-Host "Cleaning $PackagePath.." Write-Host "Cleaning $PackagePath.."
Remove-Item -Recurse -Force -Path "$PackagePath" Remove-Item -Recurse -Force -Path "$PackagePath"
Write-Output "msys2 = $version" >> ~\versions.txt Write-Output "7-Zip = $version" >> ~\versions.txt

View File

@@ -1,50 +0,0 @@
param(
[Int32]$archVer=32,
[string]$toolchain="vs2019",
[bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
$libclang_version="10.0"
Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt
# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 8.0 or higher is required for building.
# Starting from Qt 5.11 QDoc requires Clang to parse C++
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain
$libclang_version = $libclang_version -replace '["."]'
function install() {
param(
[string]$sha1=$1,
[string]$destination=$2
)
$zip = "c:\users\qt\downloads\libclang-dyn.7z"
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
Download $OfficialUrl $CachedUrl $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
}
if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) {
$sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE"
}
else {
$sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40"
}
}
install $sha1 $baseDestination-$archVer
Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_")

View File

@@ -37,25 +37,25 @@
# Needed by QtWebengine # Needed by QtWebengine
$version = "12.18.0" $version = "12.18.0"
if (Is64BitWinHost) { $package = "C:\Windows\temp\nodejs-$version.zip"
$arch = "x64" $targetFolder = "C:\Utils\nodejs"
$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)"
$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip"
if ( $arch -eq 64 ) {
$sha1 = "457b1527d249ee471a9445953a906cb10c75378d" $sha1 = "457b1527d249ee471a9445953a906cb10c75378d"
} else { } else {
$arch = "x86"
$sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92"
}
$package = "C:\Windows\temp\nodejs-$version.zip" }
$targetFolder = "C:\Utils"
$installFolder = "C:\Utils\node-v$version-win-$arch"
$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip"
Write-Host "Installing Node.js" Write-Host "Installing Node.js"
Download $externalUrl $internalUrl $package Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1 Verify-Checksum $package $sha1
mkdir $targetFolder
Extract-7Zip $package $targetFolder Extract-7Zip $package $targetFolder
Add-Path $installFolder Add-Path $targetFolder
Remove $package Remove $package
Write-Output "Node.js = $version" >> ~/versions.txt Write-Output "Node.js = $version" >> ~/versions.txt

View File

@@ -40,7 +40,7 @@ $version = "6.6.1"
$qtBranch = "515x" $qtBranch = "515x"
$targetDir = "C:\Utils\squish" $targetDir = "C:\Utils\squish"
$squishPackage = "C:\Utils\rta_squish" $squishPackage = "C:\Utils\rta_squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build"
$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
# Squish license # Squish license
@@ -62,9 +62,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) { if (Is64BitWinHost) {
$sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800"
} else { } else {
$sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a"
#Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun"
} }
} elseif ($OSVersion -eq "Windows 7 Enterprise") { } elseif ($OSVersion -eq "Windows 7 Enterprise") {
$winVersion = "win7" $winVersion = "win7"
@@ -72,7 +70,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
} }
$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils"
Verify-Checksum "C:\Utils\$squishArchive" $sha1 Verify-Checksum "C:\Utils\$squishArchive" $sha1
Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
Rename-Item "$squishPackage" "$targetDir" Rename-Item "$squishPackage" "$targetDir"

View File

@@ -1,71 +0,0 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will update MSVC 2019.
# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release
$version = "16_7_5"
$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe"
$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe"
$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00"
$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe"
$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe"
$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e"
$installerPath = "C:\Windows\Temp\installer.exe"
function Install {
Param (
[string] $urlOfficial = $(BadParam("Official url path")),
[string] $urlCache = $(BadParam("Cached url path")),
[string] $sha1 = $(BadParam("SHA1 checksum of the file"))
)
Write-Host "Installing msvc 2019 $version"
Download $urlOfficial $urlCache $installerPath
Verify-Checksum $installerPath $sha1
Run-Executable "$installerPath" "update --passive --wait"
Remove-Item -Force -Path $installerPath
}
Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1)
Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt
Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -1,6 +1,8 @@
#!/usr/bin/env bash
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,11 +32,8 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install Azure singtool using Dotnet SDK set -ex
$dotnet = "C:\Program Files\dotnet\dotnet.exe"
$version = "2.0.17"
Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
# shellcheck source=../common/unix/python-modules.sh
source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh"

View File

@@ -80,7 +80,7 @@ installPackages+=(pulseaudio-libs-devel)
installPackages+=(libXtst-devel) installPackages+=(libXtst-devel)
installPackages+=(nspr-devel) installPackages+=(nspr-devel)
installPackages+=(nss-devel) installPackages+=(nss-devel)
installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH! installPackages+=(rh-nodejs12-nodejs)
installPackages+=(rh-nodejs12-nodejs-devel) installPackages+=(rh-nodejs12-nodejs-devel)
# For Android builds # For Android builds
installPackages+=(java-1.8.0-openjdk-devel) installPackages+=(java-1.8.0-openjdk-devel)
@@ -146,8 +146,3 @@ sudo /usr/local/bin/pip3 install wheel
# shellcheck source=../common/unix/SetEnvVar.sh # shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin:\$PATH"
gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -1,8 +0,0 @@
#!/usr/bin/env bash
set -ex
# Activate these modules
# This is needed by Nodejs and QtWebEngine
sudo SUSEConnect -p sle-module-web-scripting/15/x86_64

View File

@@ -2,7 +2,7 @@
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -105,13 +105,3 @@ sudo zypper -nq install sqlite3 sqlite3-devel
# Java - needed by RTA jenkins # Java - needed by RTA jenkins
sudo zypper -nq install java sudo zypper -nq install java
# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
sudo zypper -nq update open-vm-tools
# Nodejs - needed by QtWebEngine
sudo zypper -nq install nodejs10
sudo zypper -nq install nodejs10-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -5,4 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh # shellcheck source=../common/linux/gcc.sh
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 InstallGCC 9.3.0 50 526bc0ed135e65366080350d0f991157752223c0 b746688bf045a316fc92c3528138ad10d0822b6b

View File

@@ -1,4 +0,0 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2
# qtwebengine # qtwebengine
sudo zypper -nq install alsa-devel dbus-1-devel \ sudo zypper -nq install alsa-devel dbus-1-devel \
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel
# qtwebkit # qtwebkit
sudo zypper -nq install libxml2-devel libxslt-devel sudo zypper -nq install libxml2-devel libxslt-devel
@@ -50,5 +50,3 @@ sudo zypper -nq install cups-devel
#speech-dispatcher #speech-dispatcher
sudo zypper -nq install libspeechd-devel sudo zypper -nq install libspeechd-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-v100-dyn.sh
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
set -ex
brew install --build-from-source node

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
brew install nodejs

View File

@@ -1,6 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

View File

@@ -1,2 +0,0 @@
# Allow SMB client guest logons to SMB server.
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

View File

@@ -1,6 +1,6 @@
############################################################################# #############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,5 +36,8 @@
# MSVC 2015 Update 3 # MSVC 2015 Update 3
Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt
# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" # MSVC 2017
Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt
# MSVC 2017 Build Tools
Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt

View File

@@ -1,2 +0,0 @@
. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019
. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019

View File

@@ -1,2 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-dotnet.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1"

2
qt3d

Submodule qt3d updated: 208f5835e6...34171b1d99

2
qtbase

Submodule qtbase updated: 49adb85d34...40143c189b

2
qtdoc

Submodule qtdoc updated: 485e42bebe...2d00e0060b

2
qtqa

Submodule qtqa updated: 36da1912a9...db367270e4

Submodule qtscxml updated: 57491f554b...95aa78be79

2
qtsvg

Submodule qtsvg updated: 119bb99715...52d3788c7b

Submodule qttools updated: 83b91bf9db...cc52debd90