mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-01 21:05:41 +08:00
Compare commits
56 Commits
5.14.2
...
v5.15.0-be
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da2fcb2958 | ||
|
|
10e843566e | ||
|
|
fd2b713a87 | ||
|
|
3b264301b0 | ||
|
|
b601579dda | ||
|
|
9e97db2714 | ||
|
|
97aa53410e | ||
|
|
4ade81d4dd | ||
|
|
c36c046f1a | ||
|
|
7e126af82f | ||
|
|
769362560f | ||
|
|
e3bbc27500 | ||
|
|
d6d9806883 | ||
|
|
bb39b8730a | ||
|
|
59a1bcec4e | ||
|
|
e01ec6d6f5 | ||
|
|
5f01869f16 | ||
|
|
704ef6207d | ||
|
|
eaf196219b | ||
|
|
f8ab18df91 | ||
|
|
9d78f3bd2b | ||
|
|
f908a069d9 | ||
|
|
75192dee07 | ||
|
|
cfa998544d | ||
|
|
4a0e64744f | ||
|
|
a9633efe67 | ||
|
|
7286bd9f7a | ||
|
|
2dc0539847 | ||
|
|
3ae7991090 | ||
|
|
cac62e47fe | ||
|
|
a626d59af1 | ||
|
|
1def8bb62c | ||
|
|
af7cf0fc3f | ||
|
|
c48c756bb9 | ||
|
|
14174482be | ||
|
|
4282752c19 | ||
|
|
7c1c98e123 | ||
|
|
4b6c05815a | ||
|
|
b5c9819be2 | ||
|
|
f9183e71bf | ||
|
|
b3f160bc39 | ||
|
|
ebc02c3265 | ||
|
|
d148d7b0f7 | ||
|
|
8287111e7b | ||
|
|
db4e91ce90 | ||
|
|
d406ff6398 | ||
|
|
37244913d3 | ||
|
|
41fa18a06b | ||
|
|
1430513438 | ||
|
|
37e43d23fc | ||
|
|
4f903d0139 | ||
|
|
2d577a83ec | ||
|
|
52068b49e8 | ||
|
|
f76c553d75 | ||
|
|
97afb2ce08 | ||
|
|
8f87412708 |
90
.gitmodules
vendored
90
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,99 +123,99 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -229,98 +229,98 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.14
|
||||
status = preview
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.14
|
||||
status = preview
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.14
|
||||
status = preview
|
||||
branch = 5.15
|
||||
status = addon
|
||||
|
||||
@@ -10,17 +10,11 @@ Configurations:
|
||||
Template: 'qtci-windows-7-x86-3'
|
||||
Compiler: 'Mingw73'
|
||||
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-16'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'MSVC2017'
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['DisableTests']
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
@@ -41,15 +35,10 @@ Configurations:
|
||||
Compiler: 'MSVC2015'
|
||||
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 -qt-zlib'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2017'
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['DisableTests']
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
|
||||
@@ -58,12 +47,7 @@ Configurations:
|
||||
-
|
||||
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 -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
|
||||
Compiler: 'GCC'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -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'
|
||||
@@ -71,16 +55,16 @@ Configurations:
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.0-x86_64'
|
||||
Template: 'qtci-linux-openSUSE-15.1-x86_64'
|
||||
Compiler: 'GCC'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.0-x86_64'
|
||||
Template: 'qtci-linux-openSUSE-15.1-x86_64'
|
||||
Compiler: 'ICC_18'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.0-x86_64'
|
||||
Template: 'qtci-linux-openSUSE-15.1-x86_64'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'DisableTests']
|
||||
@@ -94,7 +78,7 @@ Configurations:
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
Compiler: 'GCC'
|
||||
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 -qt-xcb -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-2'
|
||||
Compiler: 'Clang'
|
||||
@@ -116,20 +100,6 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Features: ['Packaging', 'DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'TvOS_ANY'
|
||||
Target arch: 'multi'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'WatchOS_ANY'
|
||||
Target arch: 'multi'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
Target os: 'Android_ANY'
|
||||
|
||||
@@ -3,12 +3,12 @@ Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
Target arch: 'x86'
|
||||
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_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% -static -no-icu'
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Target os: 'WinRT_10'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
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-msvc2017 -xplatform winrt-x86-msvc2017 -qt-zlib'
|
||||
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-x86-msvc2019 -qt-zlib'
|
||||
-
|
||||
Template: 'qtci-windows-7-x86-3'
|
||||
Compiler: 'Mingw73'
|
||||
@@ -25,15 +25,15 @@
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Target os: 'WinRT_10'
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
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-msvc2017 -xplatform winrt-arm-msvc2017 -qt-zlib'
|
||||
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 -qt-zlib'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Target os: 'WinRT_10'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
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-msvc2017 -xplatform winrt-x64-msvc2017 -qt-zlib'
|
||||
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 -qt-zlib'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Target os: 'Android_ANY'
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
Compiler: 'MSVC2015'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.0-x86_64'
|
||||
Template: 'qtci-linux-openSUSE-15.1-x86_64'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Features: ['DisableTests']
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-
|
||||
Template: 'qtci-windows-10-x86-3'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-6.6-x86_64'
|
||||
|
||||
@@ -3,12 +3,12 @@ Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
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'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-16'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
Target arch: 'x86'
|
||||
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% -static -no-icu'
|
||||
|
||||
@@ -10,5 +10,5 @@
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86-3'
|
||||
Compiler: 'MSVC2017'
|
||||
Compiler: 'MSVC2019'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
|
||||
|
||||
@@ -88,15 +88,15 @@ function InstallGCC() {
|
||||
|
||||
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
|
||||
if [ -f "/usr/sbin/update-alternatives" ]; then
|
||||
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
|
||||
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
|
||||
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
|
||||
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
|
||||
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
|
||||
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
|
||||
--slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
|
||||
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
|
||||
else
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
|
||||
fi
|
||||
|
||||
echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf
|
||||
|
||||
@@ -67,6 +67,9 @@ function InstallFromCompressedFileFromURL {
|
||||
"xz")
|
||||
tar -xf "$targetFile" --directory "$targetDirectory"
|
||||
;;
|
||||
"tbz2")
|
||||
tar -xjf "$targetFile" --directory "$targetDirectory"
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
;;
|
||||
|
||||
@@ -39,59 +39,55 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
|
||||
version="1.38.27"
|
||||
version_node="8.9.1"
|
||||
urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages"
|
||||
version="1.39.8"
|
||||
urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
|
||||
targetFolder="/opt/emsdk"
|
||||
|
||||
urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz"
|
||||
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
|
||||
sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
|
||||
# cross-platform emscripten SDK
|
||||
urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
|
||||
urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
|
||||
sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
|
||||
|
||||
# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
|
||||
if uname -a |grep -q Darwin; then
|
||||
urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz"
|
||||
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz"
|
||||
urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz"
|
||||
urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz"
|
||||
sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa"
|
||||
sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7"
|
||||
node_js="$targetFolder/node-v$version_node-darwin-x64/bin"
|
||||
urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
|
||||
urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
|
||||
sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
|
||||
|
||||
urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
|
||||
urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
|
||||
sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
|
||||
pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
|
||||
else
|
||||
urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz"
|
||||
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
|
||||
urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz"
|
||||
urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz"
|
||||
sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
|
||||
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
|
||||
node_js="$targetFolder/node-v$version_node-linux-x64/bin"
|
||||
urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
|
||||
urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
|
||||
sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
|
||||
|
||||
urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
|
||||
urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
|
||||
sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
|
||||
pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
|
||||
fi
|
||||
|
||||
sudo mkdir "$targetFolder"
|
||||
|
||||
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" ""
|
||||
|
||||
sudo chmod -R a+rwx "$targetFolder"
|
||||
|
||||
echo "Writing $targetFolder/.emscripten"
|
||||
cat <<EOM >"$targetFolder/.emscripten"
|
||||
LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
|
||||
EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
|
||||
BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
|
||||
NODE_JS='$node_js/node'
|
||||
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
|
||||
SPIDERMONKEY_ENGINE = ''
|
||||
V8_ENGINE = ''
|
||||
LLVM_ROOT='$targetFolder/install/bin'
|
||||
BINARYEN_ROOT='$targetFolder/install'
|
||||
NODE_JS='$targetFolder/$pathNodeExecutable'
|
||||
TEMP_DIR = '/tmp'
|
||||
COMPILER_ENGINE = NODE_JS
|
||||
JS_ENGINES = [NODE_JS]
|
||||
EOM
|
||||
|
||||
SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\""
|
||||
SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
|
||||
SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
|
||||
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
|
||||
|
||||
echo "Emsdk = $version" >> ~/versions.txt
|
||||
echo "Emsdk node = $version_node" >> ~/versions.txt
|
||||
|
||||
@@ -169,6 +169,8 @@ installPackages+=(git-lfs)
|
||||
installPackages+=(chrpath)
|
||||
installPackages+=(gawk)
|
||||
installPackages+=(texinfo)
|
||||
# Needed for Poppler test in QtWebEngine
|
||||
installPackages+=(libpoppler-cpp-dev)
|
||||
|
||||
echo "Running update for apt"
|
||||
waitLoop
|
||||
|
||||
@@ -5,4 +5,4 @@ set -ex
|
||||
# shellcheck source=../common/linux/gcc.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
|
||||
|
||||
InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2
|
||||
InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
sudo zypper -nq install python-devel python-virtualenv
|
||||
sudo zypper -nq install python-devel python-xml
|
||||
|
||||
# install python3
|
||||
sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 597c9df33c...8b122b9b53
Submodule qtactiveqt updated: 6ae4d9b392...34d89d9b72
Submodule qtandroidextras updated: 2f0a5a4192...f4d122b291
2
qtbase
2
qtbase
Submodule qtbase updated: 875420f1c2...7cec37572a
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 5d0f450901...c8e3bf2905
Submodule qtconnectivity updated: a2769b323d...35fe7d452d
Submodule qtdatavis3d updated: b255d8923b...407bee91eb
Submodule qtdeclarative updated: dd481a2bb4...4482aa576b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: bc37d41cd8...1c2369121e
Submodule qtgamepad updated: e936e2bf84...196713714a
Submodule qtgraphicaleffects updated: aca14b5484...617bb58eb0
Submodule qtimageformats updated: 9584748fc6...5a1a12b0e1
Submodule qtlocation updated: 1fb878d8de...0a074c7164
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 798be5abdb...f5cc3184f3
Submodule qtmacextras updated: 8245e27d9b...9f58d3afbf
Submodule qtmultimedia updated: 12460a14bd...6a7d1bd6ac
Submodule qtnetworkauth updated: 5e31c8a640...1afc99397b
Submodule qtpurchasing updated: ae27a573d6...6ec39500b6
2
qtqa
2
qtqa
Submodule qtqa updated: 4098117a40...0a7b4f9f2f
Submodule qtquick3d updated: 82e8864f49...a77e066c15
Submodule qtquickcontrols updated: caecffab98...eb554a20ec
Submodule qtquickcontrols2 updated: 09476c590a...6cdd4b5303
Submodule qtquicktimeline updated: 7f05ba0039...973e5e6da2
Submodule qtremoteobjects updated: 9129bbda7b...15e437e870
Submodule qtrepotools updated: 4370cfe245...fbe6d232ba
2
qtscript
2
qtscript
Submodule qtscript updated: bfaadab30c...36300dd06b
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 2ac294443a...85ef74c296
Submodule qtsensors updated: 233d2d083f...3c7ddeeeb9
Submodule qtserialbus updated: ab6f188bf0...3653815f3c
Submodule qtserialport updated: 553b62badf...b30052fa41
2
qtspeech
2
qtspeech
Submodule qtspeech updated: c47161c6c4...d8f4cfd515
2
qtsvg
2
qtsvg
Submodule qtsvg updated: d072a505d7...8dbfbe633e
2
qttools
2
qttools
Submodule qttools updated: 698ffa215f...98a4e4291d
Submodule qttranslations updated: c14fdb7653...fc73b5dbf6
Submodule qtvirtualkeyboard updated: cef398f8c2...95be4f1e39
Submodule qtwayland updated: e4e03650db...f195b7db8a
Submodule qtwebchannel updated: 9f056f7902...1f793c8877
Submodule qtwebengine updated: 97bfaef8a3...0e59294a0f
Submodule qtwebglplugin updated: 4ec76380e8...ab0d58ef0a
Submodule qtwebsockets updated: 2d10eaba16...ad75d2712a
Submodule qtwebview updated: ebf92b96ee...04b529214d
Submodule qtwinextras updated: 0d5ce87e1a...d5310efd2f
Submodule qtx11extras updated: 57910a8015...8136ffdfe8
Submodule qtxmlpatterns updated: 95b629b303...837fe1627f
Reference in New Issue
Block a user